From f7391fc33528b93a5802bd969ffb60dde5052fb8 Mon Sep 17 00:00:00 2001 From: "Adam D. Barratt" Date: Fri, 18 Jan 2013 18:42:10 +0000 Subject: [PATCH] Make "approve" an alias for "unblock" An "approve" hint is effectively an unblock for tpu packages and britney is already quiite happy to parse "unblock $pkg/$tpuversion". We allow the old name to be used for compatibility and replace it with "unblock" internally. Signed-off-by: Adam D. Barratt --- britney.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/britney.py b/britney.py index 7f56976..28b5b96 100755 --- a/britney.py +++ b/britney.py @@ -831,6 +831,7 @@ class Britney(object): # All current hints require at least one argument self.__log("Malformed hint found in %s: '%s'" % (filename, line), type="W") elif l[0] in ["approve", "block", "block-all", "block-udeb", "unblock", "unblock-udeb", "force", "urgent", "remove"]: + if l[0] == 'approve': l[0] = 'unblock' for package in l[1:]: hints.add_hint('%s %s' % (l[0], package), who) elif l[0] in ["age-days"]: @@ -1483,7 +1484,7 @@ class Britney(object): # if the suite is *-proposed-updates, the package needs an explicit approval in order to go in if suite in ['tpu', 'pu']: - approves = [ x for x in self.hints.search('approve', package=src) if self.same_source(source_u[VERSION], x.version) ] + approves = [ x for x in self.hints.search('unblock', package=src) if self.same_source(source_u[VERSION], x.version) ] if approves: excuse.addhtml("Approved by %s" % approves[0].user) else: