From 38c842eb9e7470da9a8ff5af34f876bf04e12dc4 Mon Sep 17 00:00:00 2001 From: "Adam D. Barratt" Date: Thu, 23 Dec 2010 21:42:35 +0000 Subject: [PATCH] Correctly handle removal of failed tpu binNMUs in "easy"s or "hint"s Signed-off-by: Adam D. Barratt This extends the scope of commit 5e3a245759e1c8f2bff9072ce2aced2a5c626f12 to include cases where the tpu binNMUs are explicitly included in an "easy" or "hint" rather than processed as part of the main run. --- britney.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/britney.py b/britney.py index 17f2d83..d377dad 100755 --- a/britney.py +++ b/britney.py @@ -2444,9 +2444,9 @@ class Britney: if pkg[0] != '-' and pkg_name in self.sources[suite]: for p in self.sources[suite][pkg_name][BINARIES]: binary, arch = p.split("/") - if "/" in pkg and arch != pkg[pkg.find("/")+1:]: continue - del self.binaries['testing'][arch][0][binary] - self.systems[arch].remove_binary(binary) + if '/' not in pkg or pkg.endswith("/%s" % (arch)) or pkg.endswith("/%s_tpu" % (arch)): + del self.binaries['testing'][arch][0][binary] + self.systems[arch].remove_binary(binary) # undo the changes (binaries) for p in undo['binaries'].keys():