From 6dd593c293bdc808b5e7040d06657c4f89e1a8bd Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Mon, 6 Oct 2014 03:55:06 -0400 Subject: pmrule: make backup file test more robust This prevents an exception in the event backup entries are not in the correct format and brings the test in line with alpm's backup parsing which splits on the last tab rather than the first. Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- test/pacman/pmrule.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index 0eec8ea9..c2336c5d 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -103,13 +103,11 @@ class pmrule(object): if not value in newpkg.files: success = 0 elif case == "BACKUP": - found = 0 + success = 0 for f in newpkg.backup: - name, md5sum = f.split("\t") - if value == name: - found = 1 - if not found: - success = 0 + if f.startswith(value + "\t"): + success = 1 + break; else: tap.diag("PKG rule '%s' not found" % case) success = -1 -- cgit v1.2.3-70-g09d2