From 6a60ee963df4c163fee83d1820d71a934bfd34e7 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 4 Sep 2019 15:34:27 -0300 Subject: [PATCH] Port pull-debian-debdiff to Python 3 --- pull-debian-debdiff | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pull-debian-debdiff b/pull-debian-debdiff index 3858dd5..3997cea 100755 --- a/pull-debian-debdiff +++ b/pull-debian-debdiff @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # pull-debian-debdiff - find and download a specific version of a Debian # package and its immediate parent to generate a debdiff. # @@ -84,7 +84,7 @@ def main(): newpkg = DebianSourcePackage(package, version, mirrors=mirrors) try: newpkg.pull() - except DownloadError, e: + except DownloadError as e: Logger.error('Failed to download: %s', str(e)) sys.exit(1) newpkg.unpack() @@ -101,10 +101,10 @@ def main(): oldpkg = DebianSourcePackage(package, oldversion, mirrors=mirrors) try: oldpkg.pull() - except DownloadError, e: + except DownloadError as e: Logger.error('Failed to download: %s', str(e)) sys.exit(1) - print 'file://' + oldpkg.debdiff(newpkg, diffstat=True) + print('file://' + oldpkg.debdiff(newpkg, diffstat=True)) if __name__ == '__main__': diff --git a/setup.py b/setup.py index 23da03b..1c3a87e 100755 --- a/setup.py +++ b/setup.py @@ -28,6 +28,7 @@ if sys.version_info[0] >= 3: 'mk-sbuild', 'pbuilder-dist', 'pbuilder-dist-simple', + 'pull-debian-debdiff', 'pull-debian-source', 'pull-revu-source', 'reverse-build-depends', @@ -43,7 +44,6 @@ else: scripts = [ 'import-bug-from-debian', 'merge-changelog', - 'pull-debian-debdiff', 'pull-lp-source', 'pull-uca-source', 'requestbackport',