diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-03 14:04:11 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-03 14:04:11 -0400 |
| commit | b2e860717ed5747b8d66187824a747d4794ed472 (patch) | |
| tree | cfdf3df4e49a1d7006ee179bf326b25f9ee52a9f /src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | |
| parent | 217718d07643fcc36c258a99fdd8ea84fc5f3eea (diff) | |
| download | bcfg2-b2e860717ed5747b8d66187824a747d4794ed472.tar.gz bcfg2-b2e860717ed5747b8d66187824a747d4794ed472.tar.bz2 bcfg2-b2e860717ed5747b8d66187824a747d4794ed472.zip | |
made yum Packages backend support resolving by version (#1112)
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index 31670d3a3..3a7ec2920 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -171,7 +171,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, for struct in structures: for pkg in struct.xpath('//Package | //BoundPackage'): if pkg.get("name"): - initial.add(pkg.get("name")) + initial.update(collection.packages_from_entry(pkg)) elif pkg.get("group"): groups.append((pkg.get("group"), pkg.get("type"))) @@ -196,12 +196,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, self.debug_log("Packages: %d initial, %d complete, %d new" % (len(initial), len(packages), len(newpkgs))) newpkgs.sort() - for pkg in newpkgs: - lxml.etree.SubElement(independent, 'BoundPackage', name=pkg, - version=self.core.setup.cfp.get("packages", - "version", - default="auto"), - type=collection.ptype, origin='Packages') + collection.packages_to_entry(newpkgs, independent) def Refresh(self): '''Packages.Refresh() => True|False\nReload configuration |