summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-02-07 17:59:27 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-07 19:26:49 +0100
commit4e2f8d27781731021aa6b96c0ee18a8966eefe1c (patch)
tree81368613a20cc05e97175c9c3fe7c9513f02ca09
parentba4c5d93b73ef7bba0ae0c6bf2b36a42360f7a34 (diff)
core: when an already abandoned unit gets abandoned again generate a clean error
-rw-r--r--TODO2
-rw-r--r--src/core/dbus-scope.c11
-rw-r--r--src/login/logind-dbus.c3
-rw-r--r--src/shared/bus-errors.h1
4 files changed, 15 insertions, 2 deletions
diff --git a/TODO b/TODO
index 57e82ff262..b9a0f0f634 100644
--- a/TODO
+++ b/TODO
@@ -36,6 +36,8 @@ External:
Features:
+* nspawn: rename --file-label to --apifs-label
+
* 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 c46c972c26..d02569608c 100644
--- 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 "bus-errors.h"
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);
- 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);
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 30476f3ea4..651bd801ac 100644
--- 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) ||
- 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;
}
diff --git a/src/shared/bus-errors.h b/src/shared/bus-errors.h
index e9ab731bac..5637935915 100644
--- 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_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"