X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_changelog.py;h=2fe77fe6af1987e59359c8ca142c40ed1f1a47d8;hb=3c514edd02797f51246e8669eda5a0f17bbb6ea1;hp=f55f1dd8d380673f1bfe26dad39dd6e9555f8442;hpb=e69070c6d8ec784dcb81525caaf763b55265b1b9;p=dak.git

diff --git a/dak/make_changelog.py b/dak/make_changelog.py
index f55f1dd8..2fe77fe6 100755
--- a/dak/make_changelog.py
+++ b/dak/make_changelog.py
@@ -160,7 +160,7 @@ def display_changes(uploads, index):
         print upload[index]
         prev_upload = upload[0]
 
-def export_files(session, pool, clpool, temppath):
+def export_files(session, pool, clpool):
     """
     Export interesting files from source packages.
     """
@@ -225,9 +225,8 @@ def export_files(session, pool, clpool, temppath):
                         os.link(version, suite)
                         stats['created'] += 1
             unpacked.cleanup()
-        except:
-            print 'make-changelog: unable to unpack %s_%s: %s' \
-                   % (package[0], package[1], output)
+        except Exception as e:
+            print 'make-changelog: unable to unpack %s\n%s' % (p, e)
             stats['errors'] += 1
 
     for root, dirs, files in os.walk(clpool):
@@ -264,8 +263,8 @@ def main():
         if not Cnf.has_key('Make-Changelog::Options::%s' % (i)):
             Cnf['Make-Changelog::Options::%s' % (i)] = ''
 
-    apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
-    Options = Cnf.SubTree('Make-Changelog::Options')
+    apt_pkg.parse_commandline(Cnf, Arguments, sys.argv)
+    Options = Cnf.subtree('Make-Changelog::Options')
     suite = Cnf['Make-Changelog::Options::Suite']
     base_suite = Cnf['Make-Changelog::Options::Base-Suite']
     binnmu = Cnf['Make-Changelog::Options::binNMU']
@@ -283,7 +282,7 @@ def main():
     if export:
         if cnf.exportpath:
             exportpath = os.path.join(Cnf['Dir::Export'], cnf.exportpath)
-            export_files(session, Cnf['Dir::Pool'], exportpath, Cnf['Dir::TempPath'])
+            export_files(session, Cnf['Dir::Pool'], exportpath)
         else:
             utils.fubar('No changelog export path defined')
     elif binnmu: