From 4f151f94b065672cf505267b1fd31b194e3a4c06 Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Sat, 10 Sep 2022 16:42:37 +0800 Subject: [PATCH] grep-excuses: add support for the pseudo-excuses for experimental --- debian/changelog | 4 ++++ scripts/grep-excuses.1 | 3 +++ scripts/grep-excuses.pl | 17 +++++++++++++++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a58b4154..c44f59d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,10 @@ devscripts (2.22.3) UNRELEASED; urgency=medium * uscan: + Fix DEHS output. Closes: #1019259; MR: !279 + [ Paul Wise ] + * grep-excuses: + + Add support for the pseudo-excuses for experimental + -- Mattia Rizzolo Sat, 18 Jun 2022 12:38:19 +0200 devscripts (2.22.2) unstable; urgency=medium diff --git a/scripts/grep-excuses.1 b/scripts/grep-excuses.1 index 000f5123..111e33d3 100644 --- a/scripts/grep-excuses.1 +++ b/scripts/grep-excuses.1 @@ -38,6 +38,9 @@ can be used to override GREP_EXCUSES_AUTOPKGTESTS.) .B \-\-no\-autoremovals Investigate and show only testing propagation excuses, not autoremovals. .TP +\fB\-\-experimental\fR, \fB\-e\fR +Print pseudo-excuses for manual migration from experimental to unstable. +.TP .B \-\-debug Print debugging output to stderr (including url(s) fetched). .SH "CONFIGURATION VARIABLES" diff --git a/scripts/grep-excuses.pl b/scripts/grep-excuses.pl index a4fe04c6..79d7a95e 100755 --- a/scripts/grep-excuses.pl +++ b/scripts/grep-excuses.pl @@ -69,10 +69,16 @@ my $progname = basename($0); my $modified_conf_msg; my $url = 'https://release.debian.org/britney/excuses.yaml'; +my $url_experimental + = 'https://release.debian.org/britney/pseudo-excuses-experimental.yaml'; my $rmurl = 'https://udd.debian.org/cgi-bin/autoremovals.cgi'; my $rmurl_yaml = 'https://udd.debian.org/cgi-bin/autoremovals.yaml.cgi'; +my $wipnityurl = 'https://qa.debian.org/excuses.php?package='; +my $wipnityurl_experimental + = 'https://qa.debian.org/excuses.php?experimental=1&package='; + # No longer use these - see bug#309802 my $cachedir = File::HomeDir->my_home . "/.devscripts_cache/"; my $cachefile = $cachedir . basename($url); @@ -92,6 +98,7 @@ Options: name must be given when using this option. --autopkgtests Investigate and show autopkgtest (ci.debian.net) failures --no-autoremovals Do not investigate and report autoremovals + --experimental, -e Print pseudo-excuses for experimental --help Show this help --version Give version information --debug Print debugging output to stderr @@ -122,8 +129,7 @@ sub wipnity { } while (my $package = shift) { - my $dump - = `w3m -dump -cols $columns "https://qa.debian.org/excuses.php?package=$package"`; + my $dump = `w3m -dump -cols $columns "$wipnityurl$package"`; $dump =~ s/.*(Excuse for .*)\s+Maintainer page.*/$1/ms; $dump =~ s/.*(No excuse for .*)\s+Maintainer page.*/$1/ms; print($dump); @@ -189,6 +195,13 @@ while (@ARGV and $ARGV[0] =~ /^-/) { shift; next; } + if ($ARGV[0] eq '--experimental' or $ARGV[0] eq '-e') { + $do_autoremovals = 0; + $url = $url_experimental; + $wipnityurl = $wipnityurl_experimental; + shift; + next; + } if ($ARGV[0] eq '--no-autoremovals') { $do_autoremovals = 0; shift; next; } if ($ARGV[0] eq '--autopkgtests') { $do_autopkgtests = 1; shift; next; } if ($ARGV[0] eq '--no-autopkgtests') { $do_autopkgtests = 0; shift; next; } -- GitLab