X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=daklib%2Fqueue.py;h=3ac52b344f14575b1a396a7634589b398f003939;hb=50f96efaa4536efc0636f182272ed5f57de0ebf2;hp=09831f4d75a1f1280f6e58b99c232a37af0ff6d5;hpb=bd78bbf9170cc8ee2dda06a7f060fd3370fea2bd;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index 09831f4d..3ac52b34 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -156,6 +156,7 @@ class Upload: self.Cnf = Cnf self.accept_count = 0 self.accept_bytes = 0L + self.reject_message = "" self.pkg = Pkg(changes = {}, dsc = {}, dsc_files = {}, files = {}, legacy_source_untouchable = {}) @@ -344,7 +345,7 @@ class Upload: if not changes.has_key("distribution") or not isinstance(changes["distribution"], DictType): changes["distribution"] = {} - override_summary =""; + override_summary ="" file_keys = files.keys() file_keys.sort() for file_entry in file_keys: @@ -1032,7 +1033,8 @@ SELECT s.version, su.suite_name FROM source s, src_associations sa, suite su # for example, the package was in potato but had an -sa # upload in woody. So we need to choose the right one. - x = ql[0]; # default to something sane in case we don't match any or have only one + # default to something sane in case we don't match any or have only one + x = ql[0] if len(ql) > 1: for i in ql: @@ -1053,7 +1055,8 @@ SELECT s.version, su.suite_name FROM source s, src_associations sa, suite su actual_size = os.stat(old_file)[stat.ST_SIZE] found = old_file suite_type = x[2] - dsc_files[dsc_file]["files id"] = x[3]; # need this for updating dsc_files in install() + # need this for updating dsc_files in install() + dsc_files[dsc_file]["files id"] = x[3] # See install() in process-accepted... self.pkg.orig_tar_id = x[3] self.pkg.orig_tar_gz = old_file