projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a48f3d1
)
manager: fix comment
author
Michal Schmidt
<mschmidt@redhat.com>
Tue, 17 Apr 2012 20:54:23 +0000
(22:54 +0200)
committer
Michal Schmidt
<mschmidt@redhat.com>
Fri, 20 Apr 2012 15:12:27 +0000
(17:12 +0200)
src/core/manager.c
patch
|
blob
|
history
diff --git
a/src/core/manager.c
b/src/core/manager.c
index
1446c01
..
9505629
100644
(file)
--- 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;