File 0066-Fix-continuous-minion-restart-if-a-dependency-wasn-t.patch of Package salt.3314

From e7bfc415bce2b407e6829ef9e43fda3271c4e45e Mon Sep 17 00:00:00 2001
From: Bo Maryniuk <bo@suse.de>
Date: Thu, 11 Aug 2016 12:18:19 +0200
Subject: [PATCH 66/66] Fix continuous minion restart if a dependency wasn't
 installed

---
 salt/scripts.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/salt/scripts.py b/salt/scripts.py
index 38b100d..ec67263 100644
--- a/salt/scripts.py
+++ b/salt/scripts.py
@@ -79,11 +79,13 @@ def minion_process(queue):
     try:
         minion = salt.cli.daemons.Minion()
         minion.start()
+    except ImportError as exc:
+        log.error(exc)
     except (Exception, SaltClientError, SaltReqTimeoutError, SaltSystemExit) as exc:
         log.error('Minion failed to start', exc_info=False)
         restart = True
     except SystemExit as exc:
-        restart = False
+        log.error(exc)
 
     if restart is True:
         log.warn('** Restarting minion **')
-- 
2.9.2

openSUSE Build Service is sponsored by