X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Ftransaction.c;h=64c2af5a1c37373da92a6d1f877c9354ae328f8d;hp=118a242e6e4bb4ccf8ace057509afebcffe89511;hb=5bd4b173605142c7be493aa4d958ebaef21f421d;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;ds=sidebyside diff --git a/src/core/transaction.c b/src/core/transaction.c index 118a242e6..64c2af5a1 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -22,8 +22,7 @@ #include #include -#include "bus-errors.h" -#include "bus-util.h" +#include "bus-common-errors.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); - 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));