diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2006-12-20 11:02:36 -0500 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-12-20 11:02:36 -0500 |
| commit | 884a7f4824e1ba1d6d23e514227629a7e0577904 (patch) | |
| tree | 22b52fa218930a3169fc91ab6b93bdeebbef9727 /cobbler/item_profile.py | |
| parent | 3e7029d323c6828b5d522e98ec74d7147840ce9f (diff) | |
| download | third_party-cobbler-884a7f4824e1ba1d6d23e514227629a7e0577904.tar.gz third_party-cobbler-884a7f4824e1ba1d6d23e514227629a7e0577904.tar.xz third_party-cobbler-884a7f4824e1ba1d6d23e514227629a7e0577904.zip | |
Fix problem where settings of xen_ variables if not present clobber virt_ variables (backwards compatibility code problem).
Diffstat (limited to 'cobbler/item_profile.py')
| -rw-r--r-- | cobbler/item_profile.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cobbler/item_profile.py b/cobbler/item_profile.py index 0539a8a..038c84b 100644 --- a/cobbler/item_profile.py +++ b/cobbler/item_profile.py @@ -54,19 +54,12 @@ class Profile(item.Item): # virt specific self.virt_name = self.load_item(seed_data,'virt_name') + if not self.virt_name or self.virt_name == '': + self.virt_name = self.name self.virt_ram = self.load_item(seed_data,'virt_ram') self.virt_file_size = self.load_item(seed_data,'virt_file_size') self.virt_paravirt = self.load_item(seed_data,'virt_paravirt') - # support for older versions of the cobbler files (backwards compat)... - self.virt_name = self.load_item(seed_data,'xen_name') - if not self.virt_name or self.virt_name == '': - self.virt_name = self.name - self.virt_ram = self.load_item(seed_data,'xen_ram') - self.virt_file_size = self.load_item(seed_data,'xen_file_size') - self.virt_paravirt = self.load_item(seed_data,'xen_paravirt') - - return self def set_distro(self,distro_name): |