chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strv: detect non-assignments in env blocks properly in env_append()
[elogind.git]
/
src
/
job.c
diff --git
a/src/job.c
b/src/job.c
index f5d3ff8a3a834f441d4633a40433944af2404e44..dcfa323b0ef1cf9b4ef75326f17960e18c91b518 100644
(file)
--- a/
src/job.c
+++ b/
src/job.c
@@
-313,7
+313,7
@@
bool job_is_runnable(Job *j) {
* type. */
/* First check if there is an override */
* type. */
/* First check if there is an override */
- if (j->ignore_
deps
)
+ if (j->ignore_
order
)
return true;
if (j->type == JOB_START ||
return true;
if (j->type == JOB_START ||
@@
-563,8
+563,14
@@
int job_finish_and_invalidate(Job *j, JobResult result) {
* the unit itself. We don't tread JOB_CANCELED as failure in
* this context. And JOB_FAILURE is already handled by the
* unit itself. */
* the unit itself. We don't tread JOB_CANCELED as failure in
* this context. And JOB_FAILURE is already handled by the
* unit itself. */
- if (result == JOB_TIMEOUT || result == JOB_DEPENDENCY)
+ if (result == JOB_TIMEOUT || result == JOB_DEPENDENCY) {
+ log_notice("Job %s/%s failed with result '%s'.",
+ u->meta.id,
+ job_type_to_string(t),
+ job_result_to_string(result));
+
unit_trigger_on_failure(u);
unit_trigger_on_failure(u);
+ }
/* Try to start the next jobs that can be started */
SET_FOREACH(other, u->meta.dependencies[UNIT_AFTER], i)
/* Try to start the next jobs that can be started */
SET_FOREACH(other, u->meta.dependencies[UNIT_AFTER], i)
@@
-694,7
+700,8
@@
static const char* const job_mode_table[_JOB_MODE_MAX] = {
[JOB_FAIL] = "fail",
[JOB_REPLACE] = "replace",
[JOB_ISOLATE] = "isolate",
[JOB_FAIL] = "fail",
[JOB_REPLACE] = "replace",
[JOB_ISOLATE] = "isolate",
- [JOB_IGNORE_DEPENDENCIES] = "ignore-dependencies"
+ [JOB_IGNORE_DEPENDENCIES] = "ignore-dependencies",
+ [JOB_IGNORE_REQUIREMENTS] = "ignore-requirements"
};
DEFINE_STRING_TABLE_LOOKUP(job_mode, JobMode);
};
DEFINE_STRING_TABLE_LOOKUP(job_mode, JobMode);