diff options
| -rw-r--r-- | src/lib/Client/Frame.py | 6 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Packages.py | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py index 735fb152c..8ab329e7b 100644 --- a/src/lib/Client/Frame.py +++ b/src/lib/Client/Frame.py @@ -118,6 +118,7 @@ class Frame: entry.get('name')) for entry in problems]) self.logger.error("") entries = [(entry.tag, entry.get('name')) for struct in config for entry in struct] + pkgs = [(entry.get('name'), entry.get('origin')) for struct in config for entry in struct if entry.tag == 'Package'] multi = [] for entry in entries[:]: if entries.count(entry) > 1: @@ -127,6 +128,11 @@ class Frame: self.logger.debug("The following entries are included multiple times:") self.logger.debug(["%s:%s" % entry for entry in multi]) self.logger.debug("") + if pkgs: + self.logger.debug("The following packages are specified in bcfg2:") + self.logger.debug([pkg[0] for pkg in pkgs if pkg[1] == None]) + self.logger.debug("The following packages are prereqs added by Packages:") + self.logger.debug([pkg[0] for pkg in pkgs if pkg[1] == 'Packages']) def __getattr__(self, name): diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py index 916aeafc5..e3d741197 100644 --- a/src/lib/Server/Plugins/Packages.py +++ b/src/lib/Server/Plugins/Packages.py @@ -350,7 +350,7 @@ class APTSource(Source): try: reader = gzip.GzipFile(fname) except: - print "failed to read file %s" % fname + print("Failed to read file %s" % fname) raise Exception() continue for line in reader.readlines(): @@ -497,7 +497,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, self.logger.info(list(unknown)) for pkg in packages.difference(initial): lxml.etree.SubElement(news, 'BoundPackage', name=pkg, - type=ptype, version='auto') + type=ptype, version='auto', origin='Packages') structures.append(news) def make_non_redundant(self, meta, plname): |