chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c8f4d76
)
manager: drop all pending jobs when isolating
author
Lennart Poettering
<lennart@poettering.net>
Thu, 14 Apr 2011 00:23:51 +0000
(
02:23
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sat, 16 Apr 2011 00:03:34 +0000
(
02:03
+0200)
src/manager.c
patch
|
blob
|
history
diff --git
a/src/manager.c
b/src/manager.c
index dfd33b08f4d4254598ac5134be6a221ce72d2963..495c8e6ba359b83c76fc889ade2705e3ded74dbf 100644
(file)
--- a/
src/manager.c
+++ b/
src/manager.c
@@
-1187,13
+1187,27
@@
static void transaction_minimize_impact(Manager *m) {
} while (again);
}
} while (again);
}
-static int transaction_apply(Manager *m) {
+static int transaction_apply(Manager *m
, JobMode mode
) {
Iterator i;
Job *j;
int r;
/* Moves the transaction jobs to the set of active jobs */
Iterator i;
Job *j;
int r;
/* Moves the transaction jobs to the set of active jobs */
+ if (mode == JOB_ISOLATE) {
+
+ /* When isolating first kill all installed jobs which
+ * aren't part of the new transaction */
+ HASHMAP_FOREACH(j, m->jobs, i) {
+ assert(j->installed);
+
+ if (hashmap_get(m->transaction_jobs, j->unit))
+ continue;
+
+ job_finish_and_invalidate(j, JOB_CANCELED);
+ }
+ }
+
HASHMAP_FOREACH(j, m->transaction_jobs, i) {
/* Assume merged */
assert(!j->transaction_prev);
HASHMAP_FOREACH(j, m->transaction_jobs, i) {
/* Assume merged */
assert(!j->transaction_prev);
@@
-1322,7
+1336,7
@@
static int transaction_activate(Manager *m, JobMode mode, DBusError *e) {
}
/* Tenth step: apply changes */
}
/* Tenth step: apply changes */
- if ((r = transaction_apply(m)) < 0) {
+ if ((r = transaction_apply(m
, mode
)) < 0) {
log_warning("Failed to apply transaction: %s", strerror(-r));
goto rollback;
}
log_warning("Failed to apply transaction: %s", strerror(-r));
goto rollback;
}