Fix old style shell triggers by checking for None prior to adding arg…

…s to arg list

and fix indentation

Signed-off-by: Scott Henson <shenson@redhat.com>

cobbler/utils.py

@@ -896,25 +896,26 @@ def run_triggers(api,ref,globber,additional=[],logger=None):
     # Python triggers first, before shell
 
     if logger is not None:
-       logger.debug("running python triggers from %s" % globber)
+        logger.debug("running python triggers from %s" % globber)
     modules = api.get_modules_in_category(globber)
     for m in modules:
-       arglist = []
-       if ref:
-           arglist.append(ref.name)
-       for x in additional:
-           arglist.append(x)
-       if logger is not None:
-          logger.debug("running python trigger %s" % m.__name__)
-       rc = m.run(api, arglist, logger)
-       if rc != 0:
-           raise CX("cobbler trigger failed: %s" % m.__name__)
+        arglist = []
+        if ref:
+            arglist.append(ref.name)
+        for x in additional:
+
+            arglist.append(x)
+        if logger is not None:
+            logger.debug("running python trigger %s" % m.__name__)
+        rc = m.run(api, arglist, logger)
+        if rc != 0:
+            raise CX("cobbler trigger failed: %s" % m.__name__)
 
     # now do the old shell triggers, which are usually going to be slower, but are easier to write  
     # and support any language
 
     if logger is not None:
-       logger.debug("running shell triggers from %s" % globber)
+        logger.debug("running shell triggers from %s" % globber)
     triggers = glob.glob(globber)
     triggers.sort()
     for file in triggers:
@@ -927,13 +928,14 @@ def run_triggers(api,ref,globber,additional=[],logger=None):
             if ref:
                 arglist.append(ref.name)
             for x in additional:
-                arglist.append(x)
+                if x:
+                    arglist.append(x)
             if logger is not None:
-               logger.debug("running shell trigger %s" % file)
+                logger.debug("running shell trigger %s" % file)
             rc = subprocess_call(logger, arglist, shell=False) # close_fds=True)
         except:
             if logger is not None:
-               logger.warning("failed to execute trigger: %s" % file)
+                logger.warning("failed to execute trigger: %s" % file)
             continue
 
         if rc != 0: