Merge from otavio

diff --git a/ChangeLog b/ChangeLog
index a71b8bdb3063bea8a0fbb95f5dde7a380aca8721..620e8c0f6f095b800fdcfd1a72588f918ae0c468 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
        * 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
+       sources to have 'debian-installer' section.
+
 2008-05-28  Frans Pop  <fjp@debian.org>
 
        * add autobyhand support for task overrides (from tasksel)

diff --git a/daklib/queue.py b/daklib/queue.py
index f35ee18cbd4b37c950e57cafe999a053d6b7aa35..124781993a7deb27e82769ed7bc1fe5dc673d58d 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -129,7 +129,7 @@ def check_valid(new):
         new[pkg]["priority id"] = database.get_priority_id(new[pkg]["priority"])
         # Sanity checks
         di = section.find("debian-installer") != -1
-        if (di and file_type != "udeb") or (not di and file_type == "udeb"):
+        if (di and file_type not in ("udeb", "dsc")) or (not di and file_type == "udeb"):
             new[pkg]["section id"] = -1
         if (priority == "source" and file_type != "dsc") or \
            (priority != "source" and file_type == "dsc"):