chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
manager: consider the active job when merging
[elogind.git]
/
src
/
manager.c
diff --git
a/src/manager.c
b/src/manager.c
index 92a6dff14467b9ddc81492e928a3b18915e7a948..258b3ca4b77942eda329a7576c81a1f34a005053 100644
(file)
--- a/
src/manager.c
+++ b/
src/manager.c
@@
-897,6
+897,9
@@
static int transaction_merge_jobs(Manager *m, DBusError *e) {
transaction_merge_and_delete_job(m, j, k, t);
}
+ if (j->unit->meta.job && !j->installed)
+ transaction_merge_and_delete_job(m, j, j->unit->meta.job, t);
+
assert(!j->transaction_next);
assert(!j->transaction_prev);
}