From: Luca Boccassi <bluca@debian.org>
Date: Thu, 15 Jun 2023 17:54:56 +0000 (+0100)
Subject: portable: fix silly typo in D-Bus interface name
X-Git-Tag: v254-rc1~186^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0a067a251e76c54df90612d8009c8436c9a1479;p=thirdparty%2Fsystemd.git

portable: fix silly typo in D-Bus interface name

D'oh. Nobody noticed in 3 years, I guess nobody calls these directly
and instead the manager's methods are used. Still we'll have to keep
this around, so just hide it.
---

diff --git a/man/org.freedesktop.portable1.xml b/man/org.freedesktop.portable1.xml
index 00db6f8f7ab..3b28f1dbfa0 100644
--- a/man/org.freedesktop.portable1.xml
+++ b/man/org.freedesktop.portable1.xml
@@ -380,13 +380,13 @@ node /org/freedesktop/portable1 {
                in  s copy_mode,
                out a(sss) changes_removed,
                out a(sss) changes_updated);
-      ReattacheWithExtensions(in  as extensions,
-                              in  as matches,
-                              in  s profile,
-                              in  s copy_mode,
-                              in  t flags,
-                              out a(sss) changes_removed,
-                              out a(sss) changes_updated);
+      ReattachWithExtensions(in  as extensions,
+                             in  as matches,
+                             in  s profile,
+                             in  s copy_mode,
+                             in  t flags,
+                             out a(sss) changes_removed,
+                             out a(sss) changes_updated);
       Remove();
       MarkReadOnly(in  b read_only);
       SetLimit(in  t limit);
@@ -438,7 +438,7 @@ node /org/freedesktop/portable1 {
 
     <!--method Reattach is not documented!-->
 
-    <!--method ReattacheWithExtensions is not documented!-->
+    <!--method ReattachWithExtensions is not documented!-->
 
     <!--method Remove is not documented!-->
 
@@ -472,7 +472,7 @@ node /org/freedesktop/portable1 {
 
     <variablelist class="dbus-method" generated="True" extra-ref="Reattach()"/>
 
-    <variablelist class="dbus-method" generated="True" extra-ref="ReattacheWithExtensions()"/>
+    <variablelist class="dbus-method" generated="True" extra-ref="ReattachWithExtensions()"/>
 
     <variablelist class="dbus-method" generated="True" extra-ref="Remove()"/>
 
@@ -530,7 +530,7 @@ node /org/freedesktop/portable1 {
 
         <listitem><para>Reattach()</para></listitem>
 
-        <listitem><para>ReattacheWithExtensions()</para></listitem>
+        <listitem><para>ReattachWithExtensions()</para></listitem>
 
         <listitem><para>Remove()</para></listitem>
 
diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c
index 5e46d86b08c..f271d36db54 100644
--- a/src/portable/portabled-image-bus.c
+++ b/src/portable/portabled-image-bus.c
@@ -934,7 +934,7 @@ const sd_bus_vtable image_vtable[] = {
                                               "a(sss)", changes_updated),
                                 bus_image_method_reattach,
                                 SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD_WITH_ARGS("ReattacheWithExtensions",
+        SD_BUS_METHOD_WITH_ARGS("ReattachWithExtensions",
                                 SD_BUS_ARGS("as", extensions,
                                             "as", matches,
                                             "s", profile,
@@ -959,6 +959,17 @@ const sd_bus_vtable image_vtable[] = {
                                 SD_BUS_NO_RESULT,
                                 bus_image_method_set_limit,
                                 SD_BUS_VTABLE_UNPRIVILEGED),
+        /* Deprecated silly typo */
+        SD_BUS_METHOD_WITH_ARGS("ReattacheWithExtensions",
+                                SD_BUS_ARGS("as", extensions,
+                                            "as", matches,
+                                            "s", profile,
+                                            "s", copy_mode,
+                                            "t", flags),
+                                SD_BUS_RESULT("a(sss)", changes_removed,
+                                              "a(sss)", changes_updated),
+                                bus_image_method_reattach,
+                                SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_HIDDEN),
         SD_BUS_VTABLE_END
 };