chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused variable and two function stubs
[elogind.git]
/
src
/
core
/
transaction.c
diff --git
a/src/core/transaction.c
b/src/core/transaction.c
index e2ff0bd1e5986fe0af05d4c9b0eeb06fe9150103..d00f4277e1a65ffb2a6e27d4aeb6751d3dbbbe66 100644
(file)
--- a/
src/core/transaction.c
+++ b/
src/core/transaction.c
@@
-223,7
+223,9
@@
static int delete_one_unmergeable_job(Transaction *tr, Job *j) {
/* Ok, we can drop one, so let's do so. */
log_debug_unit(d->unit->id,
/* Ok, we can drop one, so let's do so. */
log_debug_unit(d->unit->id,
- "Fixing conflicting jobs by deleting job %s/%s",
+ "Fixing conflicting jobs %s/%s,%s/%s by deleting job %s/%s",
+ j->unit->id, job_type_to_string(j->type),
+ k->unit->id, job_type_to_string(k->type),
d->unit->id, job_type_to_string(d->type));
transaction_delete_job(tr, d, true);
return 0;
d->unit->id, job_type_to_string(d->type));
transaction_delete_job(tr, d, true);
return 0;
@@
-578,7
+580,7
@@
static int transaction_apply(Transaction *tr, Manager *m, JobMode mode) {
/* Moves the transaction jobs to the set of active jobs */
/* Moves the transaction jobs to the set of active jobs */
- if (mode == JOB_ISOLATE) {
+ if (mode == JOB_ISOLATE
|| mode == JOB_FLUSH
) {
/* When isolating first kill all installed jobs which
* aren't part of the new transaction */
/* When isolating first kill all installed jobs which
* aren't part of the new transaction */