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:
edddf4f
)
job: fix pulldown-on-failure logic
author
Lennart Poettering
<lennart@poettering.net>
Wed, 7 Apr 2010 14:38:56 +0000
(16:38 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 7 Apr 2010 14:38:56 +0000
(16:38 +0200)
job.c
patch
|
blob
|
history
diff --git
a/job.c
b/job.c
index 6e04683fdd8bb7f1f501aee4de0261fda572686c..5e250d58f0ca0b9caca6c1aaaf7b3de8c07394ec 100644
(file)
--- a/
job.c
+++ b/
job.c
@@
-485,26
+485,26
@@
int job_finish_and_invalidate(Job *j, bool success) {
SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY], i)
if (other->meta.job &&
SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY], i)
if (other->meta.job &&
- (other->meta.type == JOB_START ||
- other->meta.type == JOB_VERIFY_ACTIVE ||
- other->meta.type == JOB_RELOAD_OR_START))
+ (other->meta.
job->
type == JOB_START ||
+ other->meta.
job->
type == JOB_VERIFY_ACTIVE ||
+ other->meta.
job->
type == JOB_RELOAD_OR_START))
job_finish_and_invalidate(other->meta.job, false);
SET_FOREACH(other, u->meta.dependencies[UNIT_SOFT_REQUIRED_BY], i)
if (other->meta.job &&
!other->meta.job->forced &&
job_finish_and_invalidate(other->meta.job, false);
SET_FOREACH(other, u->meta.dependencies[UNIT_SOFT_REQUIRED_BY], i)
if (other->meta.job &&
!other->meta.job->forced &&
- (other->meta.type == JOB_START ||
- other->meta.type == JOB_VERIFY_ACTIVE ||
- other->meta.type == JOB_RELOAD_OR_START))
+ (other->meta.
job->
type == JOB_START ||
+ other->meta.
job->
type == JOB_VERIFY_ACTIVE ||
+ other->meta.
job->
type == JOB_RELOAD_OR_START))
job_finish_and_invalidate(other->meta.job, false);
} else if (t == JOB_STOP) {
SET_FOREACH(other, u->meta.dependencies[UNIT_CONFLICTS], i)
if (other->meta.job &&
job_finish_and_invalidate(other->meta.job, false);
} else if (t == JOB_STOP) {
SET_FOREACH(other, u->meta.dependencies[UNIT_CONFLICTS], i)
if (other->meta.job &&
- (
t
== JOB_START ||
-
t
== JOB_VERIFY_ACTIVE ||
-
t
== JOB_RELOAD_OR_START))
+ (
other->meta.job->type
== JOB_START ||
+
other->meta.job->type
== JOB_VERIFY_ACTIVE ||
+
other->meta.job->type
== JOB_RELOAD_OR_START))
job_finish_and_invalidate(other->meta.job, false);
}
}
job_finish_and_invalidate(other->meta.job, false);
}
}