From 9771b62d8b833e06606178f19f4da2ba802931b5 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 May 2015 21:34:36 +0200
Subject: manager: fix finish_timestamp calculation

http://lists.freedesktop.org/archives/systemd-devel/2015-May/032100.html
---
 src/core/manager.c | 6 ++++++
 1 file changed, 6 insertions(+)

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)
-- 
cgit v1.2.3-54-g00ecf