summaryrefslogtreecommitdiff
path: root/src/core/manager.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/manager.c')
-rw-r--r--src/core/manager.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index 1446c01ea5..95056296ad 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -758,7 +758,7 @@ static void transaction_merge_and_delete_job(Manager *m, Job *j, Job *other, Job
assert(j->unit == other->unit);
assert(!j->installed);
- /* Merges 'other' into 'j' and then deletes j. */
+ /* Merges 'other' into 'j' and then deletes 'other'. */
j->type = t;
j->state = JOB_WAITING;
@@ -803,6 +803,7 @@ static void transaction_merge_and_delete_job(Manager *m, Job *j, Job *other, Job
other->object_list = NULL;
transaction_delete_job(m, other, true);
}
+
static bool job_is_conflicted_by(Job *j) {
JobDependency *l;