[devscripts] 02/02: grep-excuses: Refactor to consume excuses.yaml
James McCoy
jamessan at debian.org
Tue Jul 4 19:19:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch master
in repository devscripts.
commit 663f8affbc0e3ed1f8d60e1e34659f9173a74dc8
Author: James McCoy <jamessan at debian.org>
Date: Tue Jul 4 15:14:54 2017 -0400
grep-excuses: Refactor to consume excuses.yaml
This removes the regex-based parsing of update_excuses.html, instead
using YAML::Syck to parse the yaml and dump equivalent information.
Signed-off-by: James McCoy <jamessan at debian.org>
---
README | 4 ++--
debian/changelog | 3 +++
debian/control | 4 ++--
scripts/grep-excuses.pl | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/README b/README
index f331c6f..b4ad148 100644
--- a/README
+++ b/README
@@ -185,8 +185,8 @@ And now, in mostly alphabetical order, the scripts:
- git-deborig: try to produce Debian orig.tar using git-archive(1)
[libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl]
-- grep-excuses: grep the update_excuses.html file to find out what is
- happening to your packages. [libterm-size-perl, wget, w3m]
+- grep-excuses: grep britney's excuses to find out what is happening to your
+ packages. [libterm-size-perl, libyaml-syck-perl, wget, w3m]
- list-unreleased: searches for packages marked UNRELEASED in their
changelog
diff --git a/debian/changelog b/debian/changelog
index 7f1f141..7a96465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,9 @@ devscripts (2.17.7) UNRELEASED; urgency=medium
+ Use Dpkg::Version instead of shelling out to dpkg to compare upstream &
mangled versions. This improves the performance slightly and also
avoids dpkg's errors about malformed versions. (Closes: #866998)
+ * grep-excuses:
+ + Use YAML::Syck to parse excuses.yaml instead of using regex to pick
+ apart update_excuses.html.
-- Paul Wise <pabs at debian.org> Sat, 17 Jun 2017 13:11:35 +0800
diff --git a/debian/control b/debian/control
index 0cfb628..33a85bb 100644
--- a/debian/control
+++ b/debian/control
@@ -192,8 +192,8 @@ Description: scripts to make the life of a Debian Package maintainer easier
- getbuildlog: download package build logs from Debian auto-builders [wget]
- git-deborig: try to produce Debian orig.tar using git-archive(1)
[libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl]
- - grep-excuses: grep the update_excuses.html file for your packages
- [libterm-size-perl, wget, w3m]
+ - grep-excuses: grep britney's excuses for your packages [libterm-size-perl,
+ libyaml-syck-perl, wget, w3m]
- list-unreleased: search for unreleased packages
- manpage-alert: locate binaries without corresponding manpages [man-db]
- mass-bug: mass-file bug reports [bsd-mailx | mailx]
diff --git a/scripts/grep-excuses.pl b/scripts/grep-excuses.pl
index 6f7a6c9..3446a72 100755
--- a/scripts/grep-excuses.pl
+++ b/scripts/grep-excuses.pl
@@ -305,7 +305,7 @@ if (!have_yaml()) {
print DEBUG "Fetching $url\n";
-my $yaml = `wget -q -O - $url`;
+my $yaml = `wget -q -O - '$url'`;
if ($? == -1) {
die "$progname: unable to run wget: $!\n";
} elsif ($? >> 8) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git
More information about the devscripts-devel
mailing list