summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2010-02-14 22:53:19 +0000
committerNarayan Desai <desai@mcs.anl.gov>2010-02-14 22:53:19 +0000
commitb548c176f8a26619e8dfdd21eb521485c062a0d8 (patch)
tree259815936051c6f4da5f2630ffa2c30461035919 /src/lib
parentaa4c8cdd6386cec3eecf08e2bfce3553ff6ff0b4 (diff)
downloadbcfg2-b548c176f8a26619e8dfdd21eb521485c062a0d8.tar.gz
bcfg2-b548c176f8a26619e8dfdd21eb521485c062a0d8.tar.bz2
bcfg2-b548c176f8a26619e8dfdd21eb521485c062a0d8.zip
Packages: get rid of spurious whitespace in choice pkg names
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5725 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Server/Plugins/Packages.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py
index 3a90a81db..03303bf89 100644
--- a/src/lib/Server/Plugins/Packages.py
+++ b/src/lib/Server/Plugins/Packages.py
@@ -414,7 +414,7 @@ class APTSource(Source):
vindex = 0
for dep in words[1].split(','):
if '|' in dep:
- cdeps = [re.sub('\(.*\)', '', cdep) for cdep in dep.split('|')]
+ cdeps = [re.sub('\s+', '', re.sub('\(.*\)', '', cdep)) for cdep in dep.split('|')]
dyn_dname = "choice-%s-%s-%s" % (pkgname, barch, vindex)
vindex += 1
bdeps[barch][pkgname].append(dyn_dname)