From c98750508988b9549fb7506434e2d8d935630df3 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Thu, 17 Nov 2016 19:31:48 +0100 Subject: Packages: Cleanup pkgnames The pkgnames should be reset before parsing the source files. If a package was removed for a source, it should be removed from the pkgnames set, too. The packages plugin should look for the next source containing the package. --- src/lib/Bcfg2/Server/Plugins/Packages/Apt.py | 1 + src/lib/Bcfg2/Server/Plugins/Packages/Pac.py | 3 ++- src/lib/Bcfg2/Server/Plugins/Packages/Pkgng.py | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Server/Plugins') 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 -- cgit v1.2.3-1-g7c22