From 826f385767ccf9f608fcfbe35e381a9dbc59db4b Mon Sep 17 00:00:00 2001 From: Mike McCallister Date: Sat, 15 Oct 2011 22:06:31 -0500 Subject: Improve error handling of Packages plugin. Provide a descriptive error message that avoids logging a traceback. Error out (instead of continuing) upon receiving an HTTP error or an indication that the URL is malformed. Only write data to the cache file if it was successfully retrieved from the URL. Make log messages for Packages plugin use consistent "Packages:" prefix. --- src/lib/Server/Plugins/Packages/Apt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/Server/Plugins/Packages/Apt.py') diff --git a/src/lib/Server/Plugins/Packages/Apt.py b/src/lib/Server/Plugins/Packages/Apt.py index ad3ebcabd..ed954af3b 100644 --- a/src/lib/Server/Plugins/Packages/Apt.py +++ b/src/lib/Server/Plugins/Packages/Apt.py @@ -9,7 +9,7 @@ logger = logging.getLogger("Packages") class AptCollection(Collection): def get_group(self, group): - self.logger.warning("Package groups are not supported by APT") + self.logger.warning("Packages: Package groups are not supported by APT") return [] class AptSource(Source): @@ -72,7 +72,7 @@ class AptSource(Source): try: reader = gzip.GzipFile(fname) except: - logger.error("Failed to read file %s" % fname) + logger.error("Packages: Failed to read file %s" % fname) raise for line in reader.readlines(): words = str(line.strip()).split(':', 1) -- cgit v1.2.3-1-g7c22