chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: use weaker dependencies between mount and device units in --user mode
[elogind.git]
/
src
/
core
/
transaction.c
diff --git
a/src/core/transaction.c
b/src/core/transaction.c
index 118a242e6e4bb4ccf8ace057509afebcffe89511..64c2af5a1c37373da92a6d1f877c9354ae328f8d 100644
(file)
--- a/
src/core/transaction.c
+++ b/
src/core/transaction.c
@@
-22,8
+22,7
@@
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
-#include "bus-errors.h"
-#include "bus-util.h"
+#include "bus-common-errors.h"
#include "bus-error.h"
#include "transaction.h"
#include "bus-error.h"
#include "transaction.h"
@@
-722,10
+721,8
@@
int transaction_activate(Transaction *tr, Manager *m, JobMode mode, sd_bus_error
/* Tenth step: apply changes */
r = transaction_apply(tr, m, mode);
/* Tenth step: apply changes */
r = transaction_apply(tr, m, mode);
- if (r < 0) {
- log_warning_errno(-r, "Failed to apply transaction: %m");
- return r;
- }
+ if (r < 0)
+ return log_warning_errno(r, "Failed to apply transaction: %m");
assert(hashmap_isempty(tr->jobs));
assert(hashmap_isempty(tr->jobs));