Package: release.debian.org User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package devscripts/2.21.3.
[ Reason ]
There was a bug in the makefile, which made `debbisect` completely
broken.
Apologize, as I knew of the brokeness for quite some time, but I totally
forgot to merge the fixing patch and release :(
The diff is minimal, with only that fix plus another trivial change also
fixig things.
[ Impact ]
`debbisect` just won't work at all.
[ Tests ]
There is no automated test covering that part, but also josch confirmed
it's fixed now :P
Plus, looking at a binary diff is self-explanatory…
[ Risks ]
no unrelated risks besides the bit being fixed.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock devscripts/2.21.3
--
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 devscripts-2.21.2 devscripts-2.21.3
debian/changelog | 10 ++++++++++
debian/copyright | 6 +++---
scripts/Makefile | 1 +
scripts/build-rdeps.pl | 2 +-
scripts/debbisect | 9 ++++++---
scripts/debrebuild.pl | 2 +-
scripts/run_bisect.sh | 2 +-
scripts/run_bisect_qemu.sh | 2 +-
8 files changed, 24 insertions(+), 10 deletions(-)
diff -Nru devscripts-2.21.2/debian/changelog devscripts-2.21.3/debian/changelog
--- devscripts-2.21.2/debian/changelog 2021-05-02 20:57:28.000000000 +0200
+++ devscripts-2.21.3/debian/changelog 2021-06-30 15:11:06.000000000 +0200
@@ -1,3 +1,13 @@
+devscripts (2.21.3) unstable; urgency=medium
+
+ [ Johannes Schauer Marin Rodrigues ]
+ * "Update" my name in the copyright claims. MR: !230
+ * debbisect: MR: !229
+ + Fix installation of helper scripts.
+ + Improve the HTTP proxy handling of 200 and 404.
+
+ -- Mattia Rizzolo <mat...@debian.org> Wed, 30 Jun 2021 15:11:06 +0200
+
devscripts (2.21.2) unstable; urgency=medium
[ Mattia Rizzolo ]
diff -Nru devscripts-2.21.2/debian/copyright devscripts-2.21.3/debian/copyright
--- devscripts-2.21.2/debian/copyright 2021-03-16 14:16:39.000000000 +0100
+++ devscripts-2.21.3/debian/copyright 2021-05-30 19:55:29.000000000 +0200
@@ -103,7 +103,7 @@
Files: scripts/build-rdeps.pl
Copyright: Patrick Schoenfeld
- 2015, Johannes Schauer <jo...@debian.org>
+ 2015, Johannes Schauer Marin Rodrigues <jo...@debian.org>
2017, James McCoy <james...@debian.org>
License: GPL-2+
@@ -312,14 +312,14 @@
2018, Aran Deltac <bluef...@gmail.com>
Files: scripts/debrebuild.pl
-Copyright: 2014-2016, Johannes Schauer <j.scha...@email.de>
+Copyright: 2014-2016, Johannes Schauer Marin Rodrigues <jo...@debian.org>
2020 Niels Thykier <ni...@thykier.net>
License: Expat
Files: scripts/debbisect
scripts/run_bisect.sh
scripts/run_bisect_qemu.sh
-Copyright: 2014-2020, Johannes Schauer <j.scha...@email.de>
+Copyright: 2014-2020, Johannes Schauer Marin Rodrigues <jo...@debian.org>
License: Expat
Files: scripts/tagpending.pl scripts/transition-check.pl
diff -Nru devscripts-2.21.2/scripts/build-rdeps.pl devscripts-2.21.3/scripts/build-rdeps.pl
--- devscripts-2.21.2/scripts/build-rdeps.pl 2021-03-22 15:56:10.000000000 +0100
+++ devscripts-2.21.3/scripts/build-rdeps.pl 2021-05-30 19:55:29.000000000 +0200
@@ -2,7 +2,7 @@
# -*- tab-width: 4; indent-tabs-mode: t; cperl-indent-level: 4 -*-
# vim: set ai shiftwidth=4 tabstop=4 expandtab:
# Copyright (C) Patrick Schoenfeld
-# 2015 Johannes Schauer <jo...@debian.org>
+# 2015 Johannes Schauer Marin Rodrigues <jo...@debian.org>
# 2017 James McCoy <james...@debian.org>
#
# This program is free software; you can redistribute it and/or modify
diff -Nru devscripts-2.21.2/scripts/debbisect devscripts-2.21.3/scripts/debbisect
--- devscripts-2.21.2/scripts/debbisect 2021-03-16 14:16:39.000000000 +0100
+++ devscripts-2.21.3/scripts/debbisect 2021-06-30 15:09:05.000000000 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright 2020 Johannes 'josch' Schauer <jo...@debian.org>
+# Copyright 2020 Johannes Schauer Marin Rodrigues <jo...@debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -161,7 +161,6 @@
maxtries = 3
head, _ = os.path.split(path)
os.makedirs(head, exist_ok=True)
- self.send_response(HTTPStatus.OK)
totalsize = -1
downloaded = 0
for trynum in range(maxtries):
@@ -181,6 +180,7 @@
) as out:
out.seek(downloaded)
if trynum == 0:
+ self.send_response(HTTPStatus.OK)
self.send_header("Content-type", f.headers["Content-type"])
self.send_header("Content-Length", f.headers["Content-Length"])
self.send_header("Last-Modified", f.headers["Last-Modified"])
@@ -208,6 +208,9 @@
self.wfile.write(buf)
downloaded += chunksize
except urllib.error.HTTPError as e:
+ if e.code == 404:
+ self.send_error(404, "URLError")
+ return
logging.warning("got urllib.error.HTTPError: %s %s", repr(e), self.path)
except urllib.error.URLError as e:
logging.warning("got urllib.error.URLError: %s", repr(e))
@@ -868,7 +871,7 @@
DEBIAN_BISECT_EPOCH via:
date --utc --date=@$DEBIAN_BISECT_EPOCH +%Y%m%dT%H%M%SZ
-Written by Johannes 'josch' Schauer <jo...@debian.org>
+Written by Johannes Schauer Marin Rodrigues <jo...@debian.org>
""",
)
parser.add_argument(
diff -Nru devscripts-2.21.2/scripts/debrebuild.pl devscripts-2.21.3/scripts/debrebuild.pl
--- devscripts-2.21.2/scripts/debrebuild.pl 2021-03-22 15:56:14.000000000 +0100
+++ devscripts-2.21.3/scripts/debrebuild.pl 2021-05-30 19:55:29.000000000 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#
-# Copyright © 2014-2020 Johannes Schauer <j.scha...@email.de>
+# Copyright © 2014-2020 Johannes Schauer Marin Rodrigues <jo...@debian.org>
# Copyright © 2020 Niels Thykier <ni...@thykier.net>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
diff -Nru devscripts-2.21.2/scripts/Makefile devscripts-2.21.3/scripts/Makefile
--- devscripts-2.21.2/scripts/Makefile 2021-03-16 14:16:39.000000000 +0100
+++ devscripts-2.21.3/scripts/Makefile 2021-06-30 15:09:05.000000000 +0200
@@ -156,6 +156,7 @@
install -d $(DESTDIR)$(DATA_DIR)
mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(DATA_DIR)
cp debpkg-wrapper $(DESTDIR)$(BINDIR)/debpkg
+ install -d $(DESTDIR)$(DATA_DIR)/scripts
mv $(DESTDIR)$(BINDIR)/run_bisect $(DESTDIR)$(DATA_DIR)/scripts
mv $(DESTDIR)$(BINDIR)/run_bisect_qemu $(DESTDIR)$(DATA_DIR)/scripts
diff -Nru devscripts-2.21.2/scripts/run_bisect_qemu.sh devscripts-2.21.3/scripts/run_bisect_qemu.sh
--- devscripts-2.21.2/scripts/run_bisect_qemu.sh 2021-03-16 14:16:39.000000000 +0100
+++ devscripts-2.21.3/scripts/run_bisect_qemu.sh 2021-05-30 19:55:29.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright 2020 Johannes 'josch' Schauer <jo...@debian.org>
+# Copyright 2020 Johannes Schauer Marin Rodrigues <jo...@debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
diff -Nru devscripts-2.21.2/scripts/run_bisect.sh devscripts-2.21.3/scripts/run_bisect.sh
--- devscripts-2.21.2/scripts/run_bisect.sh 2021-03-16 14:16:39.000000000 +0100
+++ devscripts-2.21.3/scripts/run_bisect.sh 2021-05-30 19:55:29.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright 2020 Johannes 'josch' Schauer <jo...@debian.org>
+# Copyright 2020 Johannes Schauer Marin Rodrigues <jo...@debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
signature.asc
Description: PGP signature
