From 7966ceae1a1d70ea7edc0edce19f13ffe48f673d Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 1 Dec 2013 19:01:19 +0100 Subject: [PATCH] Change the default urgency setting to medium But don't force urgency to medium for new packages, they can still be low. Signed-off-by: Julien Cristau --- britney.conf | 2 +- britney.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/britney.conf b/britney.conf index 41038e0..1dc4f89 100644 --- a/britney.conf +++ b/britney.conf @@ -33,7 +33,7 @@ MINDAYS_MEDIUM = 5 MINDAYS_HIGH = 2 MINDAYS_CRITICAL = 0 MINDAYS_EMERGENCY = 0 -DEFAULT_URGENCY = low +DEFAULT_URGENCY = medium # hint permissions HINTS_ABA = ALL diff --git a/britney.py b/britney.py index d1eb507..3bcd973 100755 --- a/britney.py +++ b/britney.py @@ -1239,9 +1239,10 @@ class Britney(object): # retrieve the urgency for the upload, ignoring it if this is a NEW package (not present in testing) urgency = self.urgencies.get(src, self.options.default_urgency) - if not source_t and urgency != self.options.default_urgency: - excuse.addhtml("Ignoring %s urgency setting for NEW package" % (urgency)) - urgency = self.options.default_urgency + if not source_t: + if self.MINDAYS[urgency] < self.MINDAYS[self.options.default_urgency]: + excuse.addhtml("Ignoring %s urgency setting for NEW package" % (urgency)) + urgency = self.options.default_urgency # if there is a `remove' hint and the requested version is the same as the # version in testing, then stop here and return False