summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-09-09 20:08:28 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-09-09 20:08:28 +0000
commit3e5ffe0ef35365b95009eeee110717cdd3e72aac (patch)
treeab75ac2e137a22d884721cb434e25a8a04769e1d
parent7f0a758f20a599ca9a7f277d379de033da5738bf (diff)
downloadbcfg2-3e5ffe0ef35365b95009eeee110717cdd3e72aac.tar.gz
bcfg2-3e5ffe0ef35365b95009eeee110717cdd3e72aac.tar.bz2
bcfg2-3e5ffe0ef35365b95009eeee110717cdd3e72aac.zip
Packages: automatically include placeholder values for version and component fields of sources
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5422 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Plugins/Packages.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py
index ee15ba61d..14958bbda 100644
--- a/src/lib/Server/Plugins/Packages.py
+++ b/src/lib/Server/Plugins/Packages.py
@@ -15,7 +15,13 @@ def source_from_xml(xsource):
for key, tag in [('groups', 'Group'), ('components', 'Component'),
('arches', 'Arch')]:
ret[key] = [item.text for item in xsource.findall(tag)]
- ret['version'] = xsource.find('Version').text
+ # version and component need to both contain data for sources to work
+ try:
+ ret['version'] = xsource.find('Version').text
+ except:
+ ret['version'] = 'placeholder'
+ if ret['component'] == []:
+ ret['component'] = ['placeholder']
if xsource.find('RawURL') is not None:
ret['rawurl'] = xsource.find('RawURL').text
else: