Merge from otavio

diff --git a/ChangeLog b/ChangeLog
index df10978b92c2efaed3b470cd48bc245988810d07..620e8c0f6f095b800fdcfd1a72588f918ae0c468 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-08  Joerg Jaspert  <joerg@debian.org>
+
+       * dak/process_unchecked.py (check_urgency): Lowercase urgency
+       before we (eventually) warn on it. Patch taken from Russ Allbery.
+
 2008-06-01  Otavio Salvador  <otavio@debian.org>
 
        * daklib/queue.py (check_valid): allow debian-installer specific

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 34d1739f7665a025f26581a4a24c19a2d838a44e..9b8d4de5ca3b12e86b54acd789a0af1daa4972d3 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -906,10 +906,10 @@ def check_urgency ():
     if changes["architecture"].has_key("source"):
         if not changes.has_key("urgency"):
             changes["urgency"] = Cnf["Urgency::Default"]
+        changes["urgency"] = changes["urgency"].lower()
         if changes["urgency"] not in Cnf.ValueList("Urgency::Valid"):
             reject("%s is not a valid urgency; it will be treated as %s by testing." % (changes["urgency"], Cnf["Urgency::Default"]), "Warning: ")
             changes["urgency"] = Cnf["Urgency::Default"]
-        changes["urgency"] = changes["urgency"].lower()
 
 ################################################################################