Control: tag -1 - moreinfo
Hi!
On Sat, Nov 18, 2017 at 06:20:57PM +0000, Adam D. Barratt wrote:
> Thanks for looking at fixing these bugs in stable. Unfortunately, I'm
> not happy to approve the diff as-is; specific comments below.
Please let me kindly hijack this pu request and propose a new debdiff,
here attached.
I included new commits, and stashed out stuff that was nack'ed in the
first iteration.
> What's this change about, which doesn't appear to be mentioned in the
> changelog?
>
> --- dput-ng-1.13/tests/fake_package/fnord_1.0.dsc 2017-05-30 17:41:14.000000000 +0100
> +++ dput-ng-1.15+deb9u1/tests/fake_package/fnord_1.0.dsc 1970-01-01 01:00:00.000000000 +0100
> ...
> --- dput-ng-1.13/tests/fake_package/fnord_1.0_source.changes 2017-05-30 17:41:14.000000000 +0100
> +++ dput-ng-1.15+deb9u1/tests/fake_package/fnord_1.0_source.changes 1970-01-01 01:00:00.000000000 +0100
> ...
> --- dput-ng-1.13/tests/fake_package/fnord_1.0_source.test.upload 2017-05-30 17:41:14.000000000 +0100
> +++ dput-ng-1.15+deb9u1/tests/fake_package/fnord_1.0_source.test.upload 1970-01-01 01:00:00.000000000 +0100
>
FTR, these are temporary tests file that somehow got into 1.12 and I was
forced to retain for 1.13 (that was uploaded while in deep freeze) to
easy the review. I forcefully retained them for 1.13+deb9u1 as well.
Please, check out the new attached debdiff.
--
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.13 dput-ng-1.13+deb9u1
debian/changelog | 21 +++++++++++++++++++++
debian/control | 6 +++---
debian/gbp.conf | 1 +
docs/man/dcut.1.man | 4 ++--
docs/man/dput.5.man | 2 +-
dput/hooks/distribution.py | 2 +-
dput/uploaders/ftp.py | 10 ++++------
skel/codenames/debian.json | 6 ++++++
skel/profiles/mentors.json | 2 +-
skel/profiles/ports-master.json | 12 ++++++++++++
tests/dputng/codenames/debian.json | 6 ++++++
11 files changed, 58 insertions(+), 14 deletions(-)
diff -Nru dput-ng-1.13/debian/changelog dput-ng-1.13+deb9u1/debian/changelog
--- dput-ng-1.13/debian/changelog 2017-05-30 18:41:14.000000000 +0200
+++ dput-ng-1.13+deb9u1/debian/changelog 2018-05-24 10:55:38.000000000 +0200
@@ -1,3 +1,24 @@
+dput-ng (1.13+deb9u1) stretch; urgency=medium
+
+ [ Mattia Rizzolo ]
+ * Add jessie-backports-sloppy and stretch-backports targets. Closes: #878665
+ * Include 'testing' in the rm-managed suites.
+ * Fix some spelling errors in the manpages.
+ * Change the mentors.debian.net upload queue to the new recommended one.
+ * Move the git repository to salsa.debian.org.
+ * Add "olstable" to the "protected distributions". Closes: #742136
+ * Change Maintainer email address to dput-ng@packages.debian.org.
+ Closes: #899487
+
+ [ James Clarke ]
+ * Add ports-master profile. Closes: #855154
+
+ [ Stephan Sürken ]
+ * dput/uploaders/ftp.py: Parse and use optional [:port] part for fqdn.
+ Closes: #814440
+
+ -- Mattia Rizzolo <mattia@debian.org> Thu, 24 May 2018 10:55:38 +0200
+
dput-ng (1.13) unstable; urgency=medium
* Team upload.
diff -Nru dput-ng-1.13/debian/control dput-ng-1.13+deb9u1/debian/control
--- dput-ng-1.13/debian/control 2017-05-30 18:39:07.000000000 +0200
+++ dput-ng-1.13+deb9u1/debian/control 2018-05-24 10:55:38.000000000 +0200
@@ -1,7 +1,7 @@
Source: dput-ng
Section: devel
Priority: extra
-Maintainer: dput-ng Maintainers <dput-ng-maint@lists.alioth.debian.org>
+Maintainer: dput-ng Maintainers <dput-ng@packages.debian.org>
Uploaders: Arno Töll <arno@debian.org>,
Paul Tagliamonte <paultag@debian.org>
Build-Depends: debhelper (>= 10),
@@ -23,8 +23,8 @@
docbook-xsl-ns,
xsltproc
Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/dputng.git
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/dputng.git
+Vcs-Browser: https://salsa.debian.org/debian/dput-ng
+Vcs-Git: https://salsa.debian.org/debian/dput-ng.git -b stretch
Homepage: http://dput-ng.debian.net/
X-Python-Version: >= 2.7
diff -Nru dput-ng-1.13/debian/gbp.conf dput-ng-1.13+deb9u1/debian/gbp.conf
--- dput-ng-1.13/debian/gbp.conf 2017-05-30 18:39:07.000000000 +0200
+++ dput-ng-1.13+deb9u1/debian/gbp.conf 2018-05-24 10:55:38.000000000 +0200
@@ -1,3 +1,4 @@
[DEFAULT]
pristine-tar = True
debian-tag = %(version)s
+debian-branch = stretch
diff -Nru dput-ng-1.13/docs/man/dcut.1.man dput-ng-1.13+deb9u1/docs/man/dcut.1.man
--- dput-ng-1.13/docs/man/dcut.1.man 2017-05-30 18:39:07.000000000 +0200
+++ dput-ng-1.13+deb9u1/docs/man/dcut.1.man 2018-05-24 10:46:04.000000000 +0200
@@ -59,8 +59,8 @@
*-O, --output*=FILENAME::
Write the resulting commands file to 'FILENAME' instead of uploading it.
This option should not be used with the *upload* command. The selected
- 'FILENAME' wont be overwritten if it exists already. This is very helpful for
- testing that things work correctly.
+ 'FILENAME' won't be overwritten if it exists already. This is very helpful
+ for testing that things work correctly.
*-P, --passive*::
Force FTP passive mode when uploading the package through FTP.
diff -Nru dput-ng-1.13/docs/man/dput.5.man dput-ng-1.13+deb9u1/docs/man/dput.5.man
--- dput-ng-1.13/docs/man/dput.5.man 2017-05-30 18:39:07.000000000 +0200
+++ dput-ng-1.13+deb9u1/docs/man/dput.5.man 2018-05-24 10:46:04.000000000 +0200
@@ -170,7 +170,7 @@
*incoming* (string)::
The directory that *dput* should upload files to. Most upload sites do not
-allow to write files in the log-in directory. Specify a path here, to which
+allow writes in the log-in directory. Specify a path here, to which
*dput* should change the directory to, before starting to write files.
*method* (string)::
diff -Nru dput-ng-1.13/dput/hooks/distribution.py dput-ng-1.13+deb9u1/dput/hooks/distribution.py
--- dput-ng-1.13/dput/hooks/distribution.py 2017-05-30 18:39:07.000000000 +0200
+++ dput-ng-1.13+deb9u1/dput/hooks/distribution.py 2018-05-24 10:48:51.000000000 +0200
@@ -122,7 +122,7 @@
suite = changes['Distribution']
query_user = False
release_team_suites = ["testing-proposed-updates", "proposed-updates",
- "stable", "testing"]
+ "oldstable", "stable", "testing"]
if suite in release_team_suites:
msg = "Are you sure to upload to %s? Did you coordinate with the " \
"Release Team before your upload?" % (suite)
diff -Nru dput-ng-1.13/dput/uploaders/ftp.py dput-ng-1.13+deb9u1/dput/uploaders/ftp.py
--- dput-ng-1.13/dput/uploaders/ftp.py 2017-05-30 18:39:07.000000000 +0200
+++ dput-ng-1.13+deb9u1/dput/uploaders/ftp.py 2018-05-24 10:55:38.000000000 +0200
@@ -59,12 +59,10 @@
timeout = conf['timeout'] if 'timeout' in conf else 10
try:
- self._ftp = ftplib.FTP(
- self._config["fqdn"],
- self._config["login"],
- None,
- timeout=timeout
- )
+ self._ftp = ftplib.FTP()
+ host, dummy, port = self._config["fqdn"].partition(":")
+ self._ftp.connect(host, None if port == "" else int(port), timeout)
+ self._ftp.login(self._config["login"])
except Exception as e:
raise FtpUploadException(
"Could not establish FTP connection to %s: %s" % (
diff -Nru dput-ng-1.13/skel/codenames/debian.json dput-ng-1.13+deb9u1/skel/codenames/debian.json
--- dput-ng-1.13/skel/codenames/debian.json 2017-05-30 18:39:07.000000000 +0200
+++ dput-ng-1.13+deb9u1/skel/codenames/debian.json 2018-05-24 10:55:21.000000000 +0200
@@ -2,7 +2,9 @@
"backport": [
"stable-backports",
"oldstable-backports",
+ "stretch-backports",
"jessie-backports",
+ "jessie-backports-sloppy",
"wheezy-backports",
"wheezy-backports-sloppy",
"squeeze-backports",
@@ -16,6 +18,7 @@
"sid"
],
"rm-managed": [
+ "testing",
"stable",
"oldstable",
"bullseye",
@@ -42,5 +45,8 @@
"stretch-security",
"buster-security",
"bullseye-security"
+ ],
+ "ports": [
+ "unreleased"
]
}
diff -Nru dput-ng-1.13/skel/profiles/mentors.json dput-ng-1.13+deb9u1/skel/profiles/mentors.json
--- dput-ng-1.13/skel/profiles/mentors.json 2017-05-30 18:39:07.000000000 +0200
+++ dput-ng-1.13+deb9u1/skel/profiles/mentors.json 2018-05-24 10:46:34.000000000 +0200
@@ -5,7 +5,7 @@
],
"allowed_distributions": ".*",
"fqdn": "mentors.debian.net",
- "incoming": ".",
+ "incoming": "/pub/UploadQueue/",
"login": "anonymous",
"meta": "debian",
"method": "ftp"
diff -Nru dput-ng-1.13/skel/profiles/ports-master.json dput-ng-1.13+deb9u1/skel/profiles/ports-master.json
--- dput-ng-1.13/skel/profiles/ports-master.json 1970-01-01 01:00:00.000000000 +0100
+++ dput-ng-1.13+deb9u1/skel/profiles/ports-master.json 2018-05-24 10:55:21.000000000 +0200
@@ -0,0 +1,12 @@
+{
+ "fqdn": "ports-master.debian.org",
+ "incoming": "/incoming/",
+ "login": "anonymous",
+ "meta": "debian",
+ "method": "ftp",
+ "allowed-distribution": {
+ "codename-groups": [
+ "general", "ports"
+ ]
+ }
+}
diff -Nru dput-ng-1.13/tests/dputng/codenames/debian.json dput-ng-1.13+deb9u1/tests/dputng/codenames/debian.json
--- dput-ng-1.13/tests/dputng/codenames/debian.json 2017-05-30 18:39:07.000000000 +0200
+++ dput-ng-1.13+deb9u1/tests/dputng/codenames/debian.json 2018-05-24 10:55:21.000000000 +0200
@@ -2,7 +2,9 @@
"backport": [
"stable-backports",
"oldstable-backports",
+ "stretch-backports",
"jessie-backports",
+ "jessie-backports-sloppy",
"wheezy-backports",
"wheezy-backports-sloppy",
"squeeze-backports",
@@ -16,6 +18,7 @@
"sid"
],
"rm-managed": [
+ "testing",
"stable",
"oldstable",
"bullseye",
@@ -42,5 +45,8 @@
"stretch-security",
"buster-security",
"bullseye-security"
+ ],
+ "ports": [
+ "unreleased"
]
}
Attachment:
signature.asc
Description: PGP signature