mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-05 22:20:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into swiftapps

Browse Source
This commit is contained in:
Greg Neagle
2018-10-16 10:26:29 -07:00
parent de92580f52 6af274bd61
commit ea36248df0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/client/munkilib/info.py
View File

@@ -674,7 +674,7 @@ def get_conditions():
except (OSError, IOError):
pass
if os.path.exists(conditionalscriptdir):
for conditionalscript in osutils.listdir(conditionalscriptdir):
for conditionalscript in sorted(osutils.listdir(conditionalscriptdir)):
if conditionalscript.startswith('.'):
# skip files that start with a period
continue