diff options
author | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-08-27 15:09:16 -0400 |
---|---|---|
committer | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-08-27 15:09:16 -0400 |
commit | 159c39eef9df2fe4c4797f70a2598edb8a72d15b (patch) | |
tree | 641a493e6694584b5e5ca22564e6f71176f18b5b /cobbler/item_profile.py | |
parent | 52cd0bfe11da992cc17b55f5de4175482055b1d8 (diff) | |
download | third_party-cobbler-159c39eef9df2fe4c4797f70a2598edb8a72d15b.tar.gz third_party-cobbler-159c39eef9df2fe4c4797f70a2598edb8a72d15b.tar.xz third_party-cobbler-159c39eef9df2fe4c4797f70a2598edb8a72d15b.zip |
Fix bug with upward/downward propogation of array content when using inheritance.
Diffstat (limited to 'cobbler/item_profile.py')
-rw-r--r-- | cobbler/item_profile.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cobbler/item_profile.py b/cobbler/item_profile.py index 3df3113..f27f3a7 100644 --- a/cobbler/item_profile.py +++ b/cobbler/item_profile.py @@ -40,7 +40,7 @@ class Profile(item.Item): self.ks_meta = ({}, '<<inherit>>')[is_subobject] self.virt_file_size = (5, '<<inherit>>')[is_subobject] self.virt_ram = (512, '<<inherit>>')[is_subobject] - self.repos = ("", '<<inherit>>')[is_subobject] + self.repos = ([], '<<inherit>>')[is_subobject] self.depth = 1 self.virt_type = (self.settings.default_virt_type, '<<inherit>>')[is_subobject] self.virt_path = ("", '<<inherit>>')[is_subobject] @@ -74,6 +74,8 @@ class Profile(item.Item): self.set_kernel_options(self.kernel_options) if self.ks_meta != "<<inherit>>" and type(self.ks_meta) != dict: self.set_ksmeta(self.ks_meta) + if self.repos != "<<inherit>>" and type(self.ks_meta) != list: + self.set_repos(self.repos) return self @@ -133,6 +135,7 @@ class Profile(item.Item): self.repos = repolist else: raise CX(_("repository not found")) + return True def set_kickstart(self,kickstart): """ |