summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2016-11-21 15:38:39 +0100
committerGitHub <noreply@github.com>2016-11-21 15:38:39 +0100
commit26f62d0421e85640b9da83507dea9ecf9e022c77 (patch)
tree222e67d03cfd7a2627eb886051291d2998a35d8e
parenta472e687840a12a20bb2c22875de6efad8ddc257 (diff)
parentc98750508988b9549fb7506434e2d8d935630df3 (diff)
downloadbcfg2-26f62d0421e85640b9da83507dea9ecf9e022c77.tar.gz
bcfg2-26f62d0421e85640b9da83507dea9ecf9e022c77.tar.bz2
bcfg2-26f62d0421e85640b9da83507dea9ecf9e022c77.zip
Merge pull request #367 from AlexanderS/fix/removed-packages
Packages: Cleanup pkgnames
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Packages/Apt.py1
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Packages/Pac.py3
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py1
3 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
index 5bcc482af..956cb9f51 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
@@ -86,6 +86,7 @@ class AptSource(Source):
bdeps = dict()
brecs = dict()
bprov = dict()
+ self.pkgnames = set()
self.essentialpkgs = set()
for fname in self.files:
if not self.rawurl:
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
index 2661adf67..6fc084cc4 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
@@ -124,7 +124,8 @@ class PacSource(Source):
bdeps = {}
brecs = {}
bprov = {}
-
+ self.pkgnames = set()
+ self.pacgroups = {}
for fname in self.files:
if not self.rawurl:
barch = [x for x in fname.split('@') if x in self.arches][0]
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py b/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py
index 736cdcdd4..4938efb94 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py
@@ -56,6 +56,7 @@ class PkgngSource(Source):
def read_files(self):
bdeps = dict()
+ self.pkgnames = set()
for fname in self.files:
if not self.rawurl:
abi = [x