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

keychain.security now returns error output if stdout is empty. Needed to get output from 'security show-keychain-info'

Browse Source
This commit is contained in:
Greg Neagle
2014-06-10 11:51:23 -07:00
parent 6644b958de
commit e035aeb893
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/keychain.py
+5 -1
View File
@@ -75,7 +75,7 @@ def security(verb_name, *args):
(output, err) = proc.communicate()
if proc.returncode:
raise SecurityError('%s: %s' % (proc.returncode, err))
return output
return output or err
def debug_output():
@@ -89,6 +89,10 @@ def debug_output():
munkicommon.display_info('***Info for %s***' % keychainfile)
munkicommon.display_info(
security('show-keychain-info', keychainfile))
munkicommon.display_info('***Info for System.keychain***')
munkicommon.display_info(
security('show-keychain-info',
'/Library/Keychains/System.keychain'))
except SecurityError, err:
munkicommon.display_info(str(err))