diff options
| author | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-08-27 11:53:13 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-08-27 11:53:13 -0400 |
| commit | ab3d095e7e32e6ac224bbe8de80fe6137e8df267 (patch) | |
| tree | 849097aea069ec9645aeb655189cddaec78cf3ec /cobbler/utils.py | |
| parent | 2ead5ca92d371325a67d6cef0cf38c00e88c99b1 (diff) | |
| parent | e31b10a25977251a8ca349c01fb90435b2905435 (diff) | |
| download | third_party-cobbler-ab3d095e7e32e6ac224bbe8de80fe6137e8df267.tar.gz third_party-cobbler-ab3d095e7e32e6ac224bbe8de80fe6137e8df267.tar.xz third_party-cobbler-ab3d095e7e32e6ac224bbe8de80fe6137e8df267.zip | |
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/cobbler
Conflicts:
CHANGELOG
Diffstat (limited to 'cobbler/utils.py')
| -rw-r--r-- | cobbler/utils.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cobbler/utils.py b/cobbler/utils.py index 34b77e8..7845960 100644 --- a/cobbler/utils.py +++ b/cobbler/utils.py @@ -307,7 +307,10 @@ def __consolidate(node,results): for key in node_data: value = node_data[key] if value != "<<inherit>>": - node_data_copy[key] = value + if type(value) == type({}): + node_data_copy[key] = value.copy() + else: + node_data_copy[key] = value for field in node_data_copy: @@ -328,7 +331,7 @@ def __consolidate(node,results): # or scalar. if type(data_item) == dict: # interweave hash results - results[field].update(data_item) + results[field].update(data_item.copy()) elif type(data_item) == list or type(data_item) == tuple: # add to lists (cobbler doesn't have many lists) # FIXME: should probably uniqueify list after doing this |