From 0c948a03f8d1e2de03514bebbc05f5fd59a379a0 Mon Sep 17 00:00:00 2001 From: "Adam D. Barratt" Date: Fri, 17 Sep 2010 18:49:46 +0000 Subject: [PATCH] Add implicit unblocks for t-p-u approvals Signed-off-by: Adam D. Barratt t-p-u approval previously required both an "unblock" and an "approve" hint if the package was blocked; the "approve" should be sufficient and this is the simplest method of achieving that. There are some cases where this does not quite do the right thing (e.g. for a package which has both a t-p-u "approve" hint and an "unblock" hint for the package in unstable) but it is preferable to requiring t-p-u hints to be added in pairs always. --- britney.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/britney.py b/britney.py index c7f8f22..2ac8181 100755 --- a/britney.py +++ b/britney.py @@ -802,6 +802,10 @@ class Britney: if len(hints["block"]) == 0 and len(hints["block-udeb"]) == 0: self.__log("WARNING: No block hints at all, not even udeb ones!", type="W") + # A t-p-u approval overrides an unstable block + for p in hints["approve"]: + hints["unblock"][p] = hints["approve"][p] + return hints def write_heidi(self, filename):