Minor refactoring

This commit is contained in:
Miroslav Stampar
2016-07-28 17:04:15 +02:00
parent d82f20abc4
commit 6ac5b6b759
3 changed files with 4 additions and 4 deletions

View File

@@ -2194,9 +2194,9 @@ def _mergeOptions(inputOptions, overrideOptions):
if inputOptions.pickledOptions:
try:
inputOptions = base64unpickle(inputOptions.pickledOptions)
_normalizeOptions(inputOptions)
if type(inputOptions) == dict:
inputOptions = AttribDict(inputOptions)
_normalizeOptions(inputOptions)
except Exception, ex:
errMsg = "provided invalid value '%s' for option '--pickled-options'" % inputOptions.pickledOptions
errMsg += " ('%s')" % ex if ex.message else ""