mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-21 03:58:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't process directories within conditions directory. Fixed variable name misspelling

Browse Source
This commit is contained in:
Heig Gregorian
2012-03-05 08:45:17 -08:00
parent 400411113e
commit f02b78b78e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/munkicommon.py
+6 -2
View File
@@ -1960,10 +1960,14 @@ def getConditions():
if os.path.exists(conditionalscriptdir):
from munkilib import utils
for conditionalscript in listdir(conditionalscriptdir):
conditiondalscriptpath = os.path.join(conditionalscriptdir, conditionalscript)
if conditionalscript.startswith('.'):
continue
conditionalscriptpath = os.path.join(conditionalscriptdir, conditionalscript)
if os.path.isdir(conditionalscriptpath):
continue
try:
# attempt to execute condition script
result, stdout, stderr = utils.runExternalScript(conditiondalscriptpath)
result, stdout, stderr = utils.runExternalScript(conditionalscriptpath)
except utils.ScriptNotFoundError:
pass # script is not required, so pass
except utils.RunExternalScriptError, e: