diff options
Diffstat (limited to 'src/lib/Server/Plugins')
| -rw-r--r-- | src/lib/Server/Plugins/Packages.py | 4 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Probes.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py index ee21fb622..438c1d5c0 100644 --- a/src/lib/Server/Plugins/Packages.py +++ b/src/lib/Server/Plugins/Packages.py @@ -280,12 +280,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): diff --git a/src/lib/Server/Plugins/Probes.py b/src/lib/Server/Plugins/Probes.py index c00185732..7ffc65bac 100644 --- a/src/lib/Server/Plugins/Probes.py +++ b/src/lib/Server/Plugins/Probes.py @@ -73,7 +73,7 @@ class Probes(Bcfg2.Server.Plugin.Plugin, def write_data(self): """Write probe data out for use with bcfg2-info.""" top = lxml.etree.Element("Probed") - for client, probed in self.probedata.iteritems(): + for client, probed in sorted(self.probedata.items()): cx = lxml.etree.SubElement(top, 'Client', name=client) for probe in probed: lxml.etree.SubElement(cx, 'Probe', name=probe, |