Last active
August 29, 2015 14:08
-
-
Save timsutton/c96bee25994177c93744 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/code/client/munkilib/keychain.py b/code/client/munkilib/keychain.py | |
index 5f743ba..50233b1 100644 | |
--- a/code/client/munkilib/keychain.py | |
+++ b/code/client/munkilib/keychain.py | |
@@ -439,7 +439,7 @@ def client_certs_newer_than_keychain(): | |
client_cert_path = certdata['client_cert_path'] | |
client_key_path = certdata['client_key_path'] | |
keychain_path = get_keychain_path() | |
- if not os.path.exists(client_cert_path): | |
+ if not client_cert_path or not os.path.exists(client_cert_path): | |
return False | |
if not os.path.exists(keychain_path): | |
return False |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Managed Software Update Tool | |
Copyright 2010-2014 The Munki Project | |
http://code.google.com/p/munki | |
Starting... | |
ERROR: Unexpected error in updatecheck: | |
Traceback (most recent call last): | |
File "./managedsoftwareupdate", line 991, in <module> | |
main() | |
File "./managedsoftwareupdate", line 703, in main | |
updatecheckresult = updatecheck.check(client_id=options.id) | |
File "/Users/tsutton/git/github/munki/code/client/munkilib/updatecheck.py", line 2858, in check | |
keychain_obj = keychain.MunkiKeychain() | |
File "/Users/tsutton/git/github/munki/code/client/munkilib/keychain.py", line 525, in __init__ | |
if client_certs_newer_than_keychain(): | |
File "/Users/tsutton/git/github/munki/code/client/munkilib/keychain.py", line 442, in client_certs_newer_than_keychain | |
if not os.path.exists(client_cert_path): | |
File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/genericpath.py", line 18, in exists | |
os.stat(path) | |
TypeError: coercing to Unicode: need string or buffer, NoneType found |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment