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

In cli admin tools, fix for clearing a preference; previously it would be ignored

Browse Source
This commit is contained in:
Greg Neagle
2017-03-14 07:11:16 -07:00
parent fa08572205
commit 790db4f9ae
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/cliutils.py
+8 -1
View File
@@ -192,10 +192,17 @@ class ConfigurationSaveError(Exception):
def configure(prompt_list):
"""Gets configuration options and saves them to preferences store"""
darwin_vers = int(os.uname()[2].split('.')[0])
edited_prefs = {}
for (key, prompt) in prompt_list:
newvalue = raw_input_with_default('%15s: ' % prompt, pref(key))
edited_prefs[key] = newvalue or pref(key) or ''
if darwin_vers == 10:
# old behavior in SL: hitting return gives you an empty string,
# and means accept the default value.
edited_prefs[key] = newvalue or pref(key) or ''
else:
# just use the edited value as-is
edited_prefs[key] = newvalue
if FOUNDATION_SUPPORT:
for key, value in edited_prefs.items():