diff -Nru dput-ng-1.28/bin/dput dput-ng-1.29/bin/dput --- dput-ng-1.28/bin/dput 2018-08-25 08:39:16.000000000 +0000 +++ dput-ng-1.29/bin/dput 2020-01-04 15:52:36.000000000 +0000 @@ -103,10 +103,15 @@ args.override = parse_overrides(overrides) if not args.changes: - changes_files = glob.glob('*.changes') - most_recent_changes_file = max(changes_files, key=os.path.getctime) profile = dput.profile.load_profile(args.host) + changes_files = glob.glob('*.changes') with dput.util.get_interface(profile) as interface: + if not changes_files: + interface.message( + title=None, + message='No .changes files found in the current directory.') + sys.exit(2) + most_recent_changes_file = max(changes_files, key=os.path.getmtime) if interface.boolean( 'dput', ('No CHANGES-FILE specified. ' diff -Nru dput-ng-1.28/debian/bin/adjust-vendor dput-ng-1.29/debian/bin/adjust-vendor --- dput-ng-1.28/debian/bin/adjust-vendor 2017-05-30 16:39:07.000000000 +0000 +++ dput-ng-1.29/debian/bin/adjust-vendor 2020-01-13 09:49:18.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) Paul Tagliamonte , 2012 under the terms # and conditions of the dput-ng project it's self. @@ -17,7 +17,7 @@ fp = "%s/%s.json" % (PROFILE_PATH, target) -print """I: === Adjusting Vendor === +print("""I: === Adjusting Vendor === I: I: Hi there, log viewer. I: @@ -33,7 +33,7 @@ I: me out (debian/bin/adjust-vendor) I: I: Fondly, -I: -- the dput-ng team""".format(vendor=distrib, target=target, fp=fp) +I: -- the dput-ng team""".format(vendor=distrib, target=target, fp=fp)) obj = {} with open(fp, 'r') as fd: diff -Nru dput-ng-1.28/debian/changelog dput-ng-1.29/debian/changelog --- dput-ng-1.28/debian/changelog 2019-07-19 06:08:52.000000000 +0000 +++ dput-ng-1.29/debian/changelog 2020-01-13 09:58:47.000000000 +0000 @@ -1,3 +1,22 @@ +dput-ng (1.29) unstable; urgency=medium + + * Team upload + + [ Joao Eriberto Mota Filho ] + * Added an example of 'dcut cancel' command to the manpage. MR: !8 + + [ Mattia Rizzolo ] + * Use the mtime instead of the ctime to decide on the latest .changes file. + * Properly error out if running without any argument but no .changes is + found in the current directory. + * Covert an internal script to Python3 as well. + * Bump Standards-Version to 4.4.1, no changes needed. + + [ Philippe Pepiot ] + * Fix a TypeError in http upload exception handling. MR: !9 + + -- Mattia Rizzolo Mon, 13 Jan 2020 10:58:47 +0100 + dput-ng (1.28) unstable; urgency=medium * Team upload. diff -Nru dput-ng-1.28/debian/control dput-ng-1.29/debian/control --- dput-ng-1.28/debian/control 2019-07-18 23:49:43.000000000 +0000 +++ dput-ng-1.29/debian/control 2020-01-13 09:58:15.000000000 +0000 @@ -25,7 +25,7 @@ python3-sphinx, python3-validictory, xsltproc, -Standards-Version: 4.4.0 +Standards-Version: 4.4.1 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/debian/dput-ng Vcs-Git: https://salsa.debian.org/debian/dput-ng.git diff -Nru dput-ng-1.28/docs/man/dcut.1.man dput-ng-1.29/docs/man/dcut.1.man --- dput-ng-1.28/docs/man/dcut.1.man 2019-02-12 16:46:21.000000000 +0000 +++ dput-ng-1.29/docs/man/dcut.1.man 2019-07-24 20:05:50.000000000 +0000 @@ -254,6 +254,8 @@ $ dcut rm --searchdirs -f udj-desktop-client_0.5.1-2_amd64.deb + $ dcut cancel -f foo_1.0-2.1_amd64.changes + $ dcut ftp-master rm -f 'linux*.deb' diff -Nru dput-ng-1.28/dput/uploaders/http.py dput-ng-1.29/dput/uploaders/http.py --- dput-ng-1.28/dput/uploaders/http.py 2018-08-25 08:39:16.000000000 +0000 +++ dput-ng-1.29/dput/uploaders/http.py 2019-12-09 10:08:47.000000000 +0000 @@ -108,7 +108,8 @@ try: urllib.request.urlopen(req) except urllib.error.HTTPError as e: - error_message = e.read() + error_message = e.read().decode( + e.headers.get_content_charset(failobj='utf-8')) if error_message: error_message = error_message.strip() if "\n" in error_message: