24 lines
1.0 KiB
Diff
24 lines
1.0 KiB
Diff
|
diff -rupN cobbler-2.0.7-orig/cobbler/utils.py cobbler-2.0.7/cobbler/utils.py
|
||
|
|
--- cobbler-2.0.7-orig/cobbler/utils.py 2013-07-17 14:28:09.987051106 -0400
|
||
|
|
+++ cobbler-2.0.7/cobbler/utils.py 2013-07-17 14:31:38.577514157 -0400
|
||
|
|
@@ -854,7 +854,8 @@ def run_triggers(api,ref,globber,additio
|
||
|
|
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 python trigger %s" % m.__name__)
|
||
|
|
rc = m.run(api, arglist, logger)
|
||
|
|
@@ -878,7 +879,8 @@ def run_triggers(api,ref,globber,additio
|
||
|
|
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)
|
||
|
|
rc = subprocess_call(logger, arglist, shell=False) # close_fds=True)
|