diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2007-11-06 18:28:21 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2007-11-06 18:28:21 -0500 |
| commit | 399882e78246cfced412b6255b43f8d9ddcb26e2 (patch) | |
| tree | 7079ca0b11680e5104e35145ae6f119855d48bf5 /cobbler/utils.py | |
| parent | 3e247800c4b123b9b60d4b3ac5af8302df6aea87 (diff) | |
| download | third_party-cobbler-399882e78246cfced412b6255b43f8d9ddcb26e2.tar.gz third_party-cobbler-399882e78246cfced412b6255b43f8d9ddcb26e2.tar.xz third_party-cobbler-399882e78246cfced412b6255b43f8d9ddcb26e2.zip | |
Fix an obscure blending corner case that was confusing koan.
Diffstat (limited to 'cobbler/utils.py')
| -rw-r--r-- | cobbler/utils.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cobbler/utils.py b/cobbler/utils.py index 3189a36..46f0010 100644 --- a/cobbler/utils.py +++ b/cobbler/utils.py @@ -311,7 +311,11 @@ def blender(api_handle,remove_hashes, root_obj, blend_cache=None): results["%s_%s" % (key,name)] = interface[key] # just to keep templates backwards compatibile if name == "intf0": - results[key] = interface[key] + # prevent stomping on profile variables, which really only happens + # with the way we check for virt_bridge, which is a profile setting + # and an interface setting + if not results.has_key(key): + results[key] = interface[key] # sanitize output for koan and kernel option lines, etc if remove_hashes: |