Merge remote-tracking branch 'ansgar/pu/wheezy' into merge

[dak.git] / dak / make_changelog.py

diff --git a/dak/make_changelog.py b/dak/make_changelog.py
index ac5581d02be8ae43a3de98d4145a1ef1a49cb7f3..2fe77fe6af1987e59359c8ca142c40ed1f1a47d8 100755 (executable)
--- a/dak/make_changelog.py
+++ b/dak/make_changelog.py
@@ -225,7 +225,7 @@ def export_files(session, pool, clpool):
                         os.link(version, suite)
                         stats['created'] += 1
             unpacked.cleanup()
-        except Exception, e:
+        except Exception as e:
             print 'make-changelog: unable to unpack %s\n%s' % (p, e)
             stats['errors'] += 1
 
@@ -263,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']