summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2010-08-30 12:48:21 +0000
committerSol Jerome <sol.jerome@gmail.com>2010-08-30 10:57:33 -0500
commit01e48ff98e5436d4e50a1c783044aac44c9d54c0 (patch)
treec92add561a5f93acc37dd7cc858b3b9cfe588c02 /src
parentafc68748a022ae304cdb0869789763e17d50e23e (diff)
downloadbcfg2-01e48ff98e5436d4e50a1c783044aac44c9d54c0.tar.gz
bcfg2-01e48ff98e5436d4e50a1c783044aac44c9d54c0.tar.bz2
bcfg2-01e48ff98e5436d4e50a1c783044aac44c9d54c0.zip
Packages: fix type conflict
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6044 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-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 5136d5055..5371e5bbe 100644
--- a/src/lib/Server/Plugins/Packages.py
+++ b/src/lib/Server/Plugins/Packages.py
@@ -334,7 +334,7 @@ class YUMSource(Source):
def get_vpkgs(self, metadata):
rv = Source.get_vpkgs(self, metadata)
for arch, fmdata in self.filemap.iteritems():
- if arch not in metadata.groups + set(['global']):
+ if arch not in metadata.groups and arch != 'global':
continue
for filename, pkgs in fmdata.iteritems():
rv[filename] = pkgs