diff options
| author | Daniel Mack <github@zonque.org> | 2015-10-23 10:50:53 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-10-23 10:50:53 +0200 |
| commit | 952b4473bc392652b1d4c9dae5ec88fd003c4e1d (patch) | |
| tree | 8d27afa9b27ceb997013868f2b80a4bb5a993911 /src/core/dbus-execute.c | |
| parent | c9fc270e462bf2f4eab963bf71234d64b0c4c30f (diff) | |
| parent | b0830e21f47109d8a6ba2fc0afbf9b2ca1ffc2a9 (diff) | |
Merge pull request #1641 from poettering/btrfs-quota
btrfs quota beef up and various other unrelated changes
Diffstat (limited to 'src/core/dbus-execute.c')
| -rw-r--r-- | src/core/dbus-execute.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 6712b86232..b8da66c985 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -1173,7 +1173,6 @@ int bus_exec_context_set_transient_property( unit_write_drop_in_private_format(u, mode, name, "Environment=%s\n", joined); } - } return 1; @@ -1262,6 +1261,10 @@ int bus_exec_context_set_transient_property( if (r < 0) return r; + r = sd_bus_message_exit_container(message); + if (r < 0) + return r; + r = fflush_and_check(f); if (r < 0) return r; @@ -1279,10 +1282,6 @@ int bus_exec_context_set_transient_property( } } - r = sd_bus_message_exit_container(message); - if (r < 0) - return r; - return 1; } else if (STR_IN_SET(name, "ReadWriteDirectories", "ReadOnlyDirectories", "InaccessibleDirectories")) { |