summaryrefslogtreecommitdiffstats
path: root/cobbler
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2007-11-15 16:31:20 -0500
committerMichael DeHaan <mdehaan@redhat.com>2007-11-15 16:31:20 -0500
commit24c9c45bf4b2bb8d69d5d2eb683fa55517d82444 (patch)
tree1819b2890ba21efbbc7a4fd54d7b6bcc82a3a965 /cobbler
parentee7627a81137e56cde1b195438e7136d35aa966d (diff)
downloadthird_party-cobbler-24c9c45bf4b2bb8d69d5d2eb683fa55517d82444.tar.gz
third_party-cobbler-24c9c45bf4b2bb8d69d5d2eb683fa55517d82444.tar.xz
third_party-cobbler-24c9c45bf4b2bb8d69d5d2eb683fa55517d82444.zip
Fix bug related to hash evaluation, bump release for testing branch
Diffstat (limited to 'cobbler')
-rw-r--r--cobbler/utils.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/cobbler/utils.py b/cobbler/utils.py
index db55128..13503e5 100644
--- a/cobbler/utils.py
+++ b/cobbler/utils.py
@@ -237,6 +237,9 @@ def input_string_or_hash(options,delim=","):
Newer versions of cobbler allow dictionaries. This function is used to allow loading
of older value formats so new users of cobbler aren't broken in an upgrade.
"""
+ if options == "<<inherit>>":
+ options = {}
+
if options is None:
return (True, {})
elif type(options) == list: