summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2011-01-06 14:27:36 -0600
committerSol Jerome <sol.jerome@gmail.com>2011-05-14 11:27:27 -0500
commit10f45369321978de15bbaf9e7cba29c42df191ce (patch)
treef72d426e129094c96d1481d9fa8b67f1aba8c779 /src
parent5b3d6a5538191fd441ccc6478a57cddf1ed4e440 (diff)
downloadbcfg2-10f45369321978de15bbaf9e7cba29c42df191ce.tar.gz
bcfg2-10f45369321978de15bbaf9e7cba29c42df191ce.tar.bz2
bcfg2-10f45369321978de15bbaf9e7cba29c42df191ce.zip
Packages: fix global package coalescing (Patch from Jeramey Crawford) (Resolves Ticket #973)
(cherry picked from commit bd5aebba93fbd67b61d1a6f3ec221bc7e94f1559)
Diffstat (limited to 'src')
-rw-r--r--src/lib/Server/Plugins/Packages.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py
index b83b7444f..b89b68468 100644
--- a/src/lib/Server/Plugins/Packages.py
+++ b/src/lib/Server/Plugins/Packages.py
@@ -278,12 +278,12 @@ class YUMSource(Source):
sdata = self.packages.values()
self.packages['global'] = copy.deepcopy(sdata.pop())
while sdata:
- self.packages['global'].intersection(sdata.pop())
+ self.packages['global'] = self.packages['global'].intersection(sdata.pop())
for key in self.packages:
if key == 'global':
continue
- self.packages[key] = self.packages['global'].difference(self.packages[key])
+ self.packages[key] = self.packages[key].difference(self.packages['global'])
self.save_state()
def parse_filelist(self, data, arch):