# TODO: Dynamically generate this list
for queue_name in [ "byhand", "new", "proposedupdates", "oldproposedupdates", "embargoed", "unembargoed" ]:
queue = get_policy_queue(queue_name, session)
- if queue and os.path.exists(queue.path, f):
+ if queue and os.path.exists(os.path.join(queue.path, f)):
self.rejects.append("%s file already exists in the %s queue." % (f, queue_name))
if not re_taint_free.match(f):
# Only a limited list of source formats are allowed in each suite
for dist in self.pkg.changes["distribution"].keys():
- allowed = [ x.format_name for x in get_suite_src_formats(dist, session) ]
+ allowed = [ x.format_name for x in dist.srcformats ]
if self.pkg.dsc["format"] not in allowed:
self.rejects.append("%s: source format '%s' not allowed in %s (accepted: %s) " % (dsc_filename, self.pkg.dsc["format"], dist, ", ".join(allowed)))
# Extract the source
try:
unpacked = UnpackedSource(dsc_filename)
- except:
- self.rejects.append("'dpkg-source -x' failed for %s." % dsc_filename)
+ except Exception, e:
+ self.rejects.append("'dpkg-source -x' failed for %s. (%s)" % (dsc_filename, str(e)))
return
if not cnf.Find("Dir::BTSVersionTrack"):