summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-05-21 21:34:36 +0200
committerLennart Poettering <lennart@poettering.net>2015-05-21 21:34:36 +0200
commit9771b62d8b833e06606178f19f4da2ba802931b5 (patch)
treebc0c0fe19bfae63947fec535ceeae3b3eb5f480a /src
parentebc9d211317bd3916282e8591e4a0bdcc5191183 (diff)
manager: fix finish_timestamp calculation
http://lists.freedesktop.org/archives/systemd-devel/2015-May/032100.html
Diffstat (limited to 'src')
-rw-r--r--src/core/manager.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index 5af5ce3b73..b931b0d71d 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2706,6 +2706,12 @@ void manager_check_finished(Manager *m) {
if (m->n_reloading > 0)
return;
+ /* Verify that we are actually running currently. Initially
+ * the exit code is set to invalid, and during operation it is
+ * then set to MANAGER_OK */
+ if (m->exit_code != MANAGER_OK)
+ return;
+
if (hashmap_size(m->jobs) > 0) {
if (m->jobs_in_progress_event_source)