Package: release.debian.org Tags: buster User: release.debian....@packages.debian.org Usertags: pu
Hi!
Please consider the proposed dput-ng update, which I already uploaded.
Here is the changelog, and find attached the debdiff from what's
currently in buster.
dput-ng (1.25+deb10u2) buster; urgency=medium
[ Philippe Pepiot ]
* Fix a TypeError in http upload exception handling. MR: !9
[ Mattia Rizzolo ]
* Fix crash in the sftp uploader in case of EACCES from the server.
Closes: #953357
* Update codenames:
+ Drop squeeze*, wheezy* and jessie-backports*.
+ Add bullseye-backports, buster-backports-sloppy.
+ Add bookworm, bookworm-proposed-updates, bookworm-security.
[ nicoo ]
* Make `dcut dm` also accept non-uploading DDs, since they are nowadays
treated the same as DMs when concerning upload permissions.
Closes: #985618; MR: !16
[ Dominic Hargreaves ]
* In dak-commands files, don't try and construct uploader email from system
hostname, instead skip the whole Uploader field, since it's optional
anyway. Closes: #984466; MR: !15
-- Mattia Rizzolo <mat...@debian.org> Tue, 23 Mar 2021 19:20:55 +0100
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
More about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for dput-ng-1.25+deb10u1 dput-ng-1.25+deb10u2
.gitlab-ci.yml | 2 +-
debian/changelog | 25 +++++++++++++++++++++++++
dput/command.py | 13 ++++++-------
dput/commands/dm.py | 22 +++++++++++++---------
dput/uploaders/http.py | 3 ++-
dput/uploaders/sftp.py | 5 +++--
skel/codenames/debian.json | 20 +++++++-------------
tests/dputng/codenames/debian.json | 20 +++++++-------------
8 files changed, 64 insertions(+), 46 deletions(-)
diff -Nru dput-ng-1.25+deb10u1/debian/changelog
dput-ng-1.25+deb10u2/debian/changelog
--- dput-ng-1.25+deb10u1/debian/changelog 2019-07-19 08:15:00.000000000
+0200
+++ dput-ng-1.25+deb10u2/debian/changelog 2021-03-23 19:20:55.000000000
+0100
@@ -1,3 +1,28 @@
+dput-ng (1.25+deb10u2) buster; urgency=medium
+
+ [ Philippe Pepiot ]
+ * Fix a TypeError in http upload exception handling. MR: !9
+
+ [ Mattia Rizzolo ]
+ * Fix crash in the sftp uploader in case of EACCES from the server.
+ Closes: #953357
+ * Update codenames:
+ + Drop squeeze*, wheezy* and jessie-backports*.
+ + Add bullseye-backports, buster-backports-sloppy.
+ + Add bookworm, bookworm-proposed-updates, bookworm-security.
+
+ [ nicoo ]
+ * Make `dcut dm` also accept non-uploading DDs, since they are nowadays
+ treated the same as DMs when concerning upload permissions.
+ Closes: #985618; MR: !16
+
+ [ Dominic Hargreaves ]
+ * In dak-commands files, don't try and construct uploader email from system
+ hostname, instead skip the whole Uploader field, since it's optional
+ anyway. Closes: #984466; MR: !15
+
+ -- Mattia Rizzolo <mat...@debian.org> Tue, 23 Mar 2021 19:20:55 +0100
+
dput-ng (1.25+deb10u1) buster; urgency=medium
[ Kunal Mehta ]
diff -Nru dput-ng-1.25+deb10u1/dput/command.py
dput-ng-1.25+deb10u2/dput/command.py
--- dput-ng-1.25+deb10u1/dput/command.py 2018-08-25 10:39:16.000000000
+0200
+++ dput-ng-1.25+deb10u2/dput/command.py 2021-03-22 20:10:04.000000000
+0100
@@ -107,15 +107,13 @@
name = gecos_name[0]
else:
name = pwd_entry.pw_gecos
- if not email_address:
- email_address = socket.getfqdn(socket.gethostname())
if args.maintainer:
(name, email_address) = email.utils.parseaddr(args.maintainer)
logger.debug("Using %s <%s> as uploader identity" % (name, email_address))
- if not name or not email_address:
+ if not (name or email_address):
raise DcutError("Your name or email could not be retrieved."
"Please set DEBEMAIL and DEBFULLNAME or provide"
" a full identity through --maintainer")
@@ -134,12 +132,14 @@
if keyid:
identity_hint = keyid
else:
- # hard to see here, but name and email is guaranteed to be set in
+ # at least one of name or email is guaranteed to be set in
# write_header()
if name:
identity_hint = name
- if email:
- identity_hint += " <%s>" % (email)
+ if email:
+ identity_hint += " <%s>" % (email)
+ else:
+ identity_hint = email
logger.trace("GPG identity hint: %s" % (identity_hint))
@@ -221,7 +221,6 @@
(name, email) = write_header(fh, profile, args)
command.produce(fh, args)
fh.flush()
- #print(fh.name)
fh.close()
if args.save:
diff -Nru dput-ng-1.25+deb10u1/dput/commands/dm.py
dput-ng-1.25+deb10u2/dput/commands/dm.py
--- dput-ng-1.25+deb10u1/dput/commands/dm.py 2018-08-25 10:39:16.000000000
+0200
+++ dput-ng-1.25+deb10u2/dput/commands/dm.py 2021-03-22 20:10:11.000000000
+0100
@@ -25,8 +25,10 @@
from dput.core import logger, get_local_username
from dput.util import run_command
-DM_KEYRING = "/usr/share/keyrings/debian-maintainers.gpg"
-
+KEYRINGS = [
+ "/usr/share/keyrings/debian-maintainers.gpg",
+ "/usr/share/keyrings/debian-nonupload.gpg"
+]
class DmCommandError(DcutError):
pass
@@ -85,13 +87,11 @@
if args.force:
return
- if not os.path.exists(DM_KEYRING):
+ if not all((os.path.exists(keyring) for keyring in KEYRINGS)):
raise DmCommandError(
"To manage DM permissions, the `debian-keyring' "
- "keyring package must be installed. "
- "File %s does not exist" % (DM_KEYRING)
+ "keyring package must be installed."
)
- return
# I HATE embedded functions. But OTOH this function is not usable
# somewhere else, so...
@@ -101,13 +101,17 @@
fingerprints += "\n- %s (%s)" % entry
return fingerprints
+ # I don't mind embedded functions ;3
+ def flatten(it):
+ return [ item for nested in it for item in nested ]
+
# TODO: Validate input. Packages must exist (i.e. be not NEW)
cmd =[
"gpg", "--no-options",
"--no-auto-check-trustdb", "--no-default-keyring",
- "--list-key", "--with-colons", "--fingerprint",
- "--keyring", DM_KEYRING, args.dm
- ]
+ "--list-key", "--with-colons", "--fingerprint"
+ ] + flatten(([ "--keyring", keyring] for keyring in KEYRINGS)) + [
args.dm ]
+
(out, err, exit_status) = run_command(cmd)
if exit_status != 0:
logger.warning("")
diff -Nru dput-ng-1.25+deb10u1/dput/uploaders/http.py
dput-ng-1.25+deb10u2/dput/uploaders/http.py
--- dput-ng-1.25+deb10u1/dput/uploaders/http.py 2018-08-25 10:39:16.000000000
+0200
+++ dput-ng-1.25+deb10u2/dput/uploaders/http.py 2021-03-23 18:48:56.000000000
+0100
@@ -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:
diff -Nru dput-ng-1.25+deb10u1/dput/uploaders/sftp.py
dput-ng-1.25+deb10u2/dput/uploaders/sftp.py
--- dput-ng-1.25+deb10u1/dput/uploaders/sftp.py 2018-02-22 10:00:33.000000000
+0100
+++ dput-ng-1.25+deb10u2/dput/uploaders/sftp.py 2021-03-22 20:05:37.000000000
+0100
@@ -24,6 +24,7 @@
import paramiko
import socket
import os
+import errno
import pwd
import os.path
from binascii import hexlify
@@ -232,7 +233,7 @@
fqdn,
e.strerror
)
- )
+ )
except paramiko.SSHException as e:
raise SftpUploadException("SFTP error uploading to %s: %s" % (
fqdn,
@@ -282,7 +283,7 @@
try:
self._sftp.put(filename, upload_filename, **self.putargs)
except IOError as e:
- if e.errno == os.errno.EACCES:
+ if e.errno == errno.EACCES:
self.upload_write_error(e)
else:
raise SftpUploadException("Could not upload file %s: %s" % (
diff -Nru dput-ng-1.25+deb10u1/.gitlab-ci.yml
dput-ng-1.25+deb10u2/.gitlab-ci.yml
--- dput-ng-1.25+deb10u1/.gitlab-ci.yml 2019-02-12 20:21:11.000000000 +0100
+++ dput-ng-1.25+deb10u2/.gitlab-ci.yml 2021-03-23 19:16:40.000000000 +0100
@@ -1,5 +1,5 @@
test:
- image: debian:unstable-slim
+ image: debian:buster-slim
before_script:
- apt-get -q update
- env DEBIAN_FRONTEND=noninteractive apt-get -q -y install
--no-install-recommends aspcud apt-cudf
diff -Nru dput-ng-1.25+deb10u1/skel/codenames/debian.json
dput-ng-1.25+deb10u2/skel/codenames/debian.json
--- dput-ng-1.25+deb10u1/skel/codenames/debian.json 2019-07-18
15:46:22.000000000 +0200
+++ dput-ng-1.25+deb10u2/skel/codenames/debian.json 2021-03-22
20:08:39.000000000 +0100
@@ -2,20 +2,15 @@
"backport": [
"stable-backports",
"oldstable-backports",
+ "bullseye-backports",
"buster-backports",
+ "buster-backports-sloppy",
"stretch-backports",
- "stretch-backports-sloppy",
- "jessie-backports",
- "jessie-backports-sloppy",
- "wheezy-backports",
- "wheezy-backports-sloppy",
- "squeeze-backports",
- "squeeze-backports-sloppy"
+ "stretch-backports-sloppy"
],
"general": [
"unstable",
"experimental",
- "squeeze-lts",
"rc-buggy",
"sid"
],
@@ -23,6 +18,8 @@
"testing",
"stable",
"oldstable",
+ "bookworm",
+ "bookworm-proposed-updates",
"bullseye",
"bullseye-proposed-updates",
"buster",
@@ -31,8 +28,6 @@
"stretch-proposed-updates",
"jessie",
"jessie-proposed-updates",
- "wheezy",
- "squeeze",
"testing-proposed-updates",
"stable-proposed-updates",
"oldstable-proposed-updates"
@@ -41,12 +36,11 @@
"testing-security",
"stable-security",
"oldstable-security",
- "squeeze-security",
- "wheezy-security",
"jessie-security",
"stretch-security",
"buster-security",
- "bullseye-security"
+ "bullseye-security",
+ "bookworm-security"
],
"ports": [
"unreleased"
diff -Nru dput-ng-1.25+deb10u1/tests/dputng/codenames/debian.json
dput-ng-1.25+deb10u2/tests/dputng/codenames/debian.json
--- dput-ng-1.25+deb10u1/tests/dputng/codenames/debian.json 2019-07-18
15:46:22.000000000 +0200
+++ dput-ng-1.25+deb10u2/tests/dputng/codenames/debian.json 2021-03-22
20:08:39.000000000 +0100
@@ -2,20 +2,15 @@
"backport": [
"stable-backports",
"oldstable-backports",
+ "bullseye-backports",
"buster-backports",
+ "buster-backports-sloppy",
"stretch-backports",
- "stretch-backports-sloppy",
- "jessie-backports",
- "jessie-backports-sloppy",
- "wheezy-backports",
- "wheezy-backports-sloppy",
- "squeeze-backports",
- "squeeze-backports-sloppy"
+ "stretch-backports-sloppy"
],
"general": [
"unstable",
"experimental",
- "squeeze-lts",
"rc-buggy",
"sid"
],
@@ -23,6 +18,8 @@
"testing",
"stable",
"oldstable",
+ "bookworm",
+ "bookworm-proposed-updates",
"bullseye",
"bullseye-proposed-updates",
"buster",
@@ -31,8 +28,6 @@
"stretch-proposed-updates",
"jessie",
"jessie-proposed-updates",
- "wheezy",
- "squeeze",
"testing-proposed-updates",
"stable-proposed-updates",
"oldstable-proposed-updates"
@@ -41,12 +36,11 @@
"testing-security",
"stable-security",
"oldstable-security",
- "squeeze-security",
- "wheezy-security",
"jessie-security",
"stretch-security",
"buster-security",
- "bullseye-security"
+ "bullseye-security",
+ "bookworm-security"
],
"ports": [
"unreleased"
signature.asc
Description: PGP signature
