chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c5778a
)
systemctl: suppress error messages when checking whether a unit needs to be reloaded
author
Lennart Poettering
<lennart@poettering.net>
Wed, 10 Jul 2013 18:37:19 +0000
(20:37 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 10 Jul 2013 21:41:03 +0000
(23:41 +0200)
src/systemctl/systemctl.c
patch
|
blob
|
history
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index 04464deec825c3e2cec999e6938613862cdf8bce..e3818cd6df9ea809c503b95c7df92c629e5bc69f 100644
(file)
--- a/
src/systemctl/systemctl.c
+++ b/
src/systemctl/systemctl.c
@@
-1454,8
+1454,9
@@
static int cancel_job(DBusConnection *bus, char **args) {
return 0;
}
return 0;
}
-static
bool
need_daemon_reload(DBusConnection *bus, const char *unit) {
+static
int
need_daemon_reload(DBusConnection *bus, const char *unit) {
_cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
_cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
+ _cleanup_dbus_error_free_ DBusError error;
dbus_bool_t b = FALSE;
DBusMessageIter iter, sub;
const char
dbus_bool_t b = FALSE;
DBusMessageIter iter, sub;
const char
@@
-1465,6
+1466,8
@@
static bool need_daemon_reload(DBusConnection *bus, const char *unit) {
_cleanup_free_ char *n = NULL;
int r;
_cleanup_free_ char *n = NULL;
int r;
+ dbus_error_init(&error);
+
/* We ignore all errors here, since this is used to show a warning only */
n = unit_name_mangle(unit);
/* We ignore all errors here, since this is used to show a warning only */
n = unit_name_mangle(unit);
@@
-1478,7
+1481,7
@@
static bool need_daemon_reload(DBusConnection *bus, const char *unit) {
"org.freedesktop.systemd1.Manager",
"GetUnit",
&reply,
"org.freedesktop.systemd1.Manager",
"GetUnit",
&reply,
-
NULL
,
+
&error
,
DBUS_TYPE_STRING, &n,
DBUS_TYPE_INVALID);
if (r < 0)
DBUS_TYPE_STRING, &n,
DBUS_TYPE_INVALID);
if (r < 0)
@@
-1499,7
+1502,7
@@
static bool need_daemon_reload(DBusConnection *bus, const char *unit) {
"org.freedesktop.DBus.Properties",
"Get",
&reply,
"org.freedesktop.DBus.Properties",
"Get",
&reply,
-
NULL
,
+
&error
,
DBUS_TYPE_STRING, &interface,
DBUS_TYPE_STRING, &property,
DBUS_TYPE_INVALID);
DBUS_TYPE_STRING, &interface,
DBUS_TYPE_STRING, &property,
DBUS_TYPE_INVALID);
@@
-1919,7
+1922,7
@@
static int start_unit_one(
return -EIO;
}
return -EIO;
}
- if (need_daemon_reload(bus, n))
+ if (need_daemon_reload(bus, n)
> 0
)
log_warning("Warning: Unit file of %s changed on disk, 'systemctl %sdaemon-reload' recommended.",
n, arg_scope == UNIT_FILE_SYSTEM ? "" : "--user ");
log_warning("Warning: Unit file of %s changed on disk, 'systemctl %sdaemon-reload' recommended.",
n, arg_scope == UNIT_FILE_SYSTEM ? "" : "--user ");