mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-23 04:59:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Quick and dirty fixes for processing manifests with conditional_items. Needs a better long term fix.

Browse Source
This commit is contained in:
Greg Neagle
2012-01-06 11:42:27 -08:00
parent 1914a1142a
commit 2a6ce0af1f
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/manifestutil
+14 -8
View File
@@ -368,10 +368,13 @@ def find(args):
value = manifest[keyname]
if type(value) == list or type(value).__name__ == 'NSCFArray':
for item in value:
if findtext.upper() in item.upper():
print '%s: %s' % (name, item)
count += 1
break
try:
if findtext.upper() in item.upper():
print '%s: %s' % (name, item)
count += 1
break
except AttributeError, err:
pass
elif findtext.upper() in value.upper():
print '%s: %s' % (name, value)
count += 1
@@ -380,10 +383,13 @@ def find(args):
value = manifest[key]
if type(value) == list or type(value).__name__ == 'NSCFArray':
for item in value:
if findtext.upper() in item.upper():
print '%s (%s): %s' % (name, key, item)
count += 1
break
try:
if findtext.upper() in item.upper():
print '%s (%s): %s' % (name, key, item)
count += 1
break
except AttributeError, err:
pass
elif findtext.upper() in value.upper():
print '%s (%s): %s' % (name, key, value)
count += 1