From: Ansgar Burchardt <ansgar@debian.org>
Date: Fri, 31 May 2013 08:12:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3fdc59341583e43920c31f820282314cc9fc8e93;hp=a8cfd3c877a0c6b369b509a97cc180d75dfd2599;p=dak.git

Merge remote-tracking branch 'origin/master'
---

diff --git a/daklib/archive.py b/daklib/archive.py
index ecd59324..81719a87 100644
--- a/daklib/archive.py
+++ b/daklib/archive.py
@@ -1076,7 +1076,9 @@ class ArchiveUpload(object):
                 remaining.append(f)
                 continue
 
-            if rule['Source'] != self.changes.source_name or rule['Section'] != f.section or rule['Extension'] != ext:
+            if rule['Source'] != self.changes.source_name \
+                    or rule['Section'] != f.section \
+                    or ('Extension' in rule and rule['Extension'] != ext):
                 remaining.append(f)
                 continue