* merge:
Monkeypatch commands.getstatusoutput to work around Python Popen issue.
drop unused imports
self.dsc_files.update(p.load())
next_obj = p.load()
- if type(next_obj) is DictType:
- self.pkg.orig_files.update(next_obj)
+ if isinstance(next_obj, dict):
+ self.orig_files.update(next_obj)
else:
# Auto-convert old dak files to new format supporting
# multiple tarballs
# Session is last argument in args
session = args[-1]
if session is None:
+ args = list(args)
session = args[-1] = DBConn().session()
private_transaction = True
"""
# Determine the type
if f.has_key("dbtype"):
- file_type = file["dbtype"]
+ file_type = f["dbtype"]
elif re_source_ext.match(f["type"]):
file_type = "dsc"
else: