X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Ftransaction.c;h=b0b3d6bd60e4d4b5c87204e1e0191041a36d1cf1;hp=d3783899997e8fef9a33b5bb47e4460c58fe18e3;hb=82a2b6bb5e4e5d294f09af778c48974a7857afb6;hpb=da927ba997d68401563b927f92e6e40e021a8e5c diff --git a/src/core/transaction.c b/src/core/transaction.c index d37838999..b0b3d6bd6 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -22,7 +22,7 @@ #include #include -#include "bus-errors.h" +#include "bus-common-errors.h" #include "bus-util.h" #include "bus-error.h" #include "transaction.h" @@ -722,10 +722,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));