X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Farchive.py;h=6aeeac4b1c5764bac3582576668994989e633aee;hb=ca4f8f6cb8803a33286a76098f6af91cdd435e6a;hp=0f3a316e79f4f9a0c41959098cd6bccd422959ab;hpb=b8c51297d7b03115240198383f76a48a519c85df;p=dak.git diff --git a/daklib/archive.py b/daklib/archive.py index 0f3a316e..6aeeac4b 100644 --- a/daklib/archive.py +++ b/daklib/archive.py @@ -603,6 +603,16 @@ class ArchiveUpload(object): self._new_queue = self.session.query(PolicyQueue).filter_by(queue_name='new').one() self._new = self._new_queue.suite + def warn(self, message): + """add a warning message + + Adds a warning message that can later be seen in C{self.warnings} + + @type message: string + @param message: warning message + """ + self.warnings.append(message) + def prepare(self): """prepare upload for further processing @@ -689,7 +699,7 @@ class ArchiveUpload(object): if src == suite_name: suite_name = dst if rtype != "silent-map": - self.warnings.append('Mapping {0} to {0}.'.format(src, dst)) + self.warnings.append('Mapping {0} to {1}.'.format(src, dst)) elif rtype == "ignore": ignored = fields[1] if suite_name == ignored: @@ -1044,7 +1054,7 @@ class ArchiveUpload(object): remaining.append(f) continue - if rule['Source'] != control['Source'] or rule['Section'] != f.section or rule['Extension'] != ext: + if rule['Source'] != self.changes.source_name or rule['Section'] != f.section or rule['Extension'] != ext: remaining.append(f) continue