core: when an already abandoned unit gets abandoned again generate a clean error

diff --git a/TODO b/TODO
index 57e82ff262a39fa49f3cc84f84eb7606de9f9c37..b9a0f0f6346ceb2939212ad68b2f3bbd639bde51 100644 (file)
--- a/TODO
+++ b/TODO
@@ -36,6 +36,8 @@ External:
 
 Features:
 
 
 Features:
 

+* nspawn: rename --file-label to --apifs-label
+

 * hookup nspawn and PrivateNetwork=yes with "ip netns"
 
 * socket units: support creating sockets in different namespace,
 * hookup nspawn and PrivateNetwork=yes with "ip netns"
 
 * socket units: support creating sockets in different namespace,

diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
index c46c972c2690a9db2532d7ad9445452c15722720..d02569608cf042650aec6c85104f156143eb6488 100644 (file)
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -27,15 +27,24 @@
 #include "dbus-scope.h"
 #include "bus-util.h"
 #include "bus-internal.h"
 #include "dbus-scope.h"
 #include "bus-util.h"
 #include "bus-internal.h"

+#include "bus-errors.h"

 
 static int bus_scope_abandon(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
         Scope *s = userdata;
 
 static int bus_scope_abandon(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
         Scope *s = userdata;

+        int r;

 
         assert(bus);
         assert(message);
         assert(s);
 
 
         assert(bus);
         assert(message);
         assert(s);
 

-        return scope_abandon(s);
+        r = scope_abandon(s);
+        if (sd_bus_error_is_set(error))
+                return r;
+
+        if (r == -ESTALE)
+                return sd_bus_error_setf(error, BUS_ERROR_SCOPE_NOT_RUNNING, "Scope %s is not running, cannot abandon.", UNIT(s)->id);
+
+        return sd_bus_reply_method_return(message, NULL);

 }
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, scope_result, ScopeResult);
 }
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, scope_result, ScopeResult);

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 30476f3ea4455a8f9d9ed7d376e066768d775b8f..651bd801ac7e99e722eaae30de3251a91711590f 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2384,7 +2384,8 @@ int manager_abandon_scope(Manager *manager, const char *scope, sd_bus_error *err
                         NULL);
         if (r < 0) {
                 if (sd_bus_error_has_name(error, BUS_ERROR_NO_SUCH_UNIT) ||
                         NULL);
         if (r < 0) {
                 if (sd_bus_error_has_name(error, BUS_ERROR_NO_SUCH_UNIT) ||

-                    sd_bus_error_has_name(error, BUS_ERROR_LOAD_FAILED)) {
+                    sd_bus_error_has_name(error, BUS_ERROR_LOAD_FAILED) ||
+                    sd_bus_error_has_name(error, BUS_ERROR_SCOPE_NOT_RUNNING)) {

                         sd_bus_error_free(error);
                         return 0;
                 }
                         sd_bus_error_free(error);
                         return 0;
                 }

diff --git a/src/shared/bus-errors.h b/src/shared/bus-errors.h
index e9ab731bacfe7caf8e6e69cb70424a206d8acffd..56379359158bb076de94eab4dcbc72c724447171 100644 (file)
--- a/src/shared/bus-errors.h
+++ b/src/shared/bus-errors.h
@@ -37,6 +37,7 @@
 #define BUS_ERROR_JOB_TYPE_NOT_APPLICABLE "org.freedesktop.systemd1.JobTypeNotApplicable"
 #define BUS_ERROR_NO_ISOLATION "org.freedesktop.systemd1.NoIsolation"
 #define BUS_ERROR_SHUTTING_DOWN "org.freedesktop.systemd1.ShuttingDown"
 #define BUS_ERROR_JOB_TYPE_NOT_APPLICABLE "org.freedesktop.systemd1.JobTypeNotApplicable"
 #define BUS_ERROR_NO_ISOLATION "org.freedesktop.systemd1.NoIsolation"
 #define BUS_ERROR_SHUTTING_DOWN "org.freedesktop.systemd1.ShuttingDown"

+#define BUS_ERROR_SCOPE_NOT_RUNNING "org.freedesktop.systemd1.ScopeNotRunning"

 
 #define BUS_ERROR_NO_SUCH_MACHINE "org.freedesktop.machine1.NoSuchMachine"
 #define BUS_ERROR_NO_MACHINE_FOR_PID "org.freedesktop.machine1.NoMachineForPID"
 
 #define BUS_ERROR_NO_SUCH_MACHINE "org.freedesktop.machine1.NoSuchMachine"
 #define BUS_ERROR_NO_MACHINE_FOR_PID "org.freedesktop.machine1.NoMachineForPID"