ftpmaster-dak r1098: Merge from otavio
------------------------------------------------------------
revno: 1098
committer: Joerg Jaspert <joerg@debian.org>
branch nick: upstream
timestamp: Sun 2008-06-08 01:22:16 +0200
message:
Merge from otavio
modified:
ChangeLog
daklib/queue.py
------------------------------------------------------------
revno: 1096.1.1
committer: Otavio Salvador <otavio@ossystems.com.br>
branch nick: fixes-process-debian-installer-section
timestamp: Sun 2008-06-01 23:16:25 -0300
message:
* daklib/queue.py (check_valid): allow debian-installer specific sources to have 'debian-installer' section.
modified:
ChangeLog
daklib/queue.py
------------------------------------------------------------
revno: 1097.1.1
committer: Joerg Jaspert <joerg@debian.org>
branch nick: di-section
timestamp: Sun 2008-06-08 01:22:01 +0200
message:
Merge from otavio
modified:
ChangeLog
daklib/queue.py
=== modified file 'ChangeLog'
--- a/ChangeLog 2008-06-07 23:18:40 +0000
+++ b/ChangeLog 2008-06-07 23:22:01 +0000
@@ -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)
=== modified file 'daklib/queue.py'
--- a/daklib/queue.py 2008-05-05 12:44:31 +0000
+++ b/daklib/queue.py 2008-06-02 02:16:25 +0000
@@ -129,7 +129,7 @@
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"):
Reply to: