From 05e6ee19d2d6e3bc5491a690c78fdb611b3d6a57 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Mon, 27 Nov 2006 01:17:41 +0000 Subject: Add support for different output formats for debsums (Resolves Ticket #298) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2545 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/APT.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/lib/Client') diff --git a/src/lib/Client/Tools/APT.py b/src/lib/Client/Tools/APT.py index 7720c3336..308f157d8 100644 --- a/src/lib/Client/Tools/APT.py +++ b/src/lib/Client/Tools/APT.py @@ -57,7 +57,16 @@ class APT(Bcfg2.Client.Tools.PkgTool): self.logger.info("Package %s has no md5sums. Cannot verify" % \ entry.get('name')) return False - files = [item.split()[-1] for item in output] + files = [] + for item in output: + if "checksum mismatch" in item: + files.append(item.split()[-1]) + elif "can't open" in item: + files.append(item.split()[5]) + else: + self.logger.error("Got Unsupported pattern %s from debsums" \ + % item) + files.append(item) bad = [filename for filename in files if filename not in modlist] if bad: self.logger.info("Package %s failed validation. Bad files are:" % \ -- cgit v1.2.3-1-g7c22