From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 7 Jul 2010 00:15:38 +0000 (+0200)
Subject: unit: don't cancel dependent jobs if a stopped daemon returned an error code
X-Git-Tag: v1~11
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=9aab5a731db87f96101c2eb5d2b15ac45c3a33c3;p=elogind.git

unit: don't cancel dependent jobs if a stopped daemon returned an error code
---

diff --git a/src/job.c b/src/job.c
index 2199d75f6..0a9ce153f 100644
--- a/src/job.c
+++ b/src/job.c
@@ -484,7 +484,7 @@ int job_finish_and_invalidate(Job *j, bool success) {
         job_free(j);
 
         if (!success)
-                unit_status_printf(u, "Starting %s... " ANSI_HIGHLIGHT_ON "failed" ANSI_HIGHLIGHT_OFF ".\n", unit_description(u));
+                unit_status_printf(u, "Starting %s " ANSI_HIGHLIGHT_ON "failed" ANSI_HIGHLIGHT_OFF ".\n", unit_description(u));
 
         /* Fail depending jobs on failure */
         if (!success) {
diff --git a/src/unit.c b/src/unit.c
index 701dbc095..4810d2b9f 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -1020,10 +1020,8 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
                 case JOB_RESTART:
                 case JOB_TRY_RESTART:
 
-                        if (ns == UNIT_INACTIVE)
+                        if (ns == UNIT_INACTIVE || ns == UNIT_MAINTENANCE)
                                 job_finish_and_invalidate(u->meta.job, true);
-                        else if (ns == UNIT_MAINTENANCE)
-                                job_finish_and_invalidate(u->meta.job, false);
                         else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) {
                                 unexpected = true;
                                 job_finish_and_invalidate(u->meta.job, false);