SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemctl: drop compat with really really old systemd versions

Browse Source
This commit is contained in:
Lennart Poettering
2013-01-14 21:25:25 +01:00
parent 7b4da18c17
commit aca26b5220
1 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemctl/systemctl.c
+2 -29
View File
@@ -1120,7 +1120,6 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
} else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Manager", "JobRemoved")) {
uint32_t id;
const char *path, *result, *unit;
dbus_bool_t success = true;
if (dbus_message_get_args(message, &error,
DBUS_TYPE_UINT32, &id,
@@ -1128,10 +1127,8 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
DBUS_TYPE_STRING, &unit,
DBUS_TYPE_STRING, &result,
DBUS_TYPE_INVALID)) {
char *p;
p = set_remove(d->set, (char*) path);
free(p);
free(set_remove(d->set, (char*) path));
if (!isempty(result))
d->result = strdup(result);
@@ -1148,40 +1145,16 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_STRING, &result,
DBUS_TYPE_INVALID)) {
char *p;
/* Compatibility with older systemd versions <
* 183 during upgrades. This should be dropped
* one day. */
p = set_remove(d->set, (char*) path);
free(p);
free(set_remove(d->set, (char*) path));
if (*result)
d->result = strdup(result);
goto finish;
}
dbus_error_free(&error);
if (dbus_message_get_args(message, &error,
DBUS_TYPE_UINT32, &id,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_BOOLEAN, &success,
DBUS_TYPE_INVALID)) {
char *p;
/* Compatibility with older systemd versions <
* 19 during upgrades. This should be dropped
* one day */
p = set_remove(d->set, (char*) path);
free(p);
if (!success)
d->result = strdup("failed");
goto finish;
}
#endif
log_error("Failed to parse message: %s", bus_error_message(&error));