This is an automated email from the git hooks/post-receive script. pabs pushed a commit to branch master in repository devscripts.
commit 14a37fdb9fa1c0a98d4049cd8f6b6784c7cf6e77 Author: Paul Wise <[email protected]> Date: Thu May 1 20:17:38 2014 +0800 Fix scraping of the wnpp web pages due to https links --- debian/changelog | 1 + scripts/wnpp-alert.sh | 6 +++--- scripts/wnpp-check.sh | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 33ad95c..25e55a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ devscripts (2.14.2) UNRELEASED; urgency=medium [ Paul Wise ] * Use HTTPS for the buildd logs to avoid a redirect + * Fix scraping of the wnpp web pages due to https links [ Cyril Brulebois ] * deb-reversion: Add support for udebs. (Closes: #739437) diff --git a/scripts/wnpp-alert.sh b/scripts/wnpp-alert.sh index da3be4b..a524cc4 100755 --- a/scripts/wnpp-alert.sh +++ b/scripts/wnpp-alert.sh @@ -96,15 +96,15 @@ fi # which don't skip over it to the label 'd' $GETCOMMAND $WNPPTMP http://www.debian.org/devel/wnpp/orphaned || \ { echo "$PROGNAME: $CURLORWGET http://www.debian.org/devel/wnpp/orphaned failed" >&2; exit 1; } -sed -ne 's/.*<li><a href="http:\/\/bugs.debian.org\/\([0-9]*\)">\([^:<]*\)[: ]*\([^<]*\)<\/a>.*/O \1 \2 -- \3/; T d; p; : d' $WNPPTMP > $WNPP +sed -ne 's/.*<li><a href="https\?:\/\/bugs.debian.org\/\([0-9]*\)">\([^:<]*\)[: ]*\([^<]*\)<\/a>.*/O \1 \2 -- \3/; T d; p; : d' $WNPPTMP > $WNPP $GETCOMMAND $WNPPTMP http://www.debian.org/devel/wnpp/rfa_bypackage || \ { echo "$PROGNAME: $CURLORWGET http://www.debian.org/devel/wnpp/rfa_bypackage"; >&2; exit 1; } -sed -ne 's/.*<li><a href="http:\/\/bugs.debian.org\/\([0-9]*\)">\([^:<]*\)[: ]*\([^<]*\)<\/a>.*/RFA \1 \2 -- \3/; T d; p; : d' $WNPPTMP >> $WNPP +sed -ne 's/.*<li><a href="https\?:\/\/bugs.debian.org\/\([0-9]*\)">\([^:<]*\)[: ]*\([^<]*\)<\/a>.*/RFA \1 \2 -- \3/; T d; p; : d' $WNPPTMP >> $WNPP $GETCOMMAND $WNPPTMP http://www.debian.org/devel/wnpp/help_requested || \ { echo "$PROGNAME: $CURLORWGET http://www.debian.org/devel/wnpp/help_requested"; >&2; exit 1; } -sed -ne 's/.*<li><a href="http:\/\/bugs.debian.org\/\([0-9]*\)">\([^:<]*\)[: ]*\([^<]*\)<\/a>.*/RFH \1 \2 -- \3/; T d; p; : d' $WNPPTMP >> $WNPP +sed -ne 's/.*<li><a href="https\?:\/\/bugs.debian.org\/\([0-9]*\)">\([^:<]*\)[: ]*\([^<]*\)<\/a>.*/RFH \1 \2 -- \3/; T d; p; : d' $WNPPTMP >> $WNPP cut -f3 -d' ' $WNPP | sort > $WNPP_PACKAGES diff --git a/scripts/wnpp-check.sh b/scripts/wnpp-check.sh index ae01d2b..46e99ff 100755 --- a/scripts/wnpp-check.sh +++ b/scripts/wnpp-check.sh @@ -61,11 +61,11 @@ trap "rm -f '$WNPP' '$WNPPTMP' '$WNPP_PACKAGES'" \ $GETCOMMAND $WNPPTMP http://www.debian.org/devel/wnpp/being_packaged || \ { echo "${0##*/}: $CURLORWGET http://www.debian.org/devel/wnpp/being_packaged failed." >&2; exit 1; } -sed -ne 's/.*<li><a href="http:\/\/bugs.debian.org\/\([0-9]*\)">\([^:<]*\)[: ]*\([^<]*\)<\/a>.*/ITP \1 \2 -- \3/; T d; p; : d' $WNPPTMP > $WNPP +sed -ne 's/.*<li><a href="https\?:\/\/bugs.debian.org\/\([0-9]*\)">\([^:<]*\)[: ]*\([^<]*\)<\/a>.*/ITP \1 \2 -- \3/; T d; p; : d' $WNPPTMP > $WNPP $GETCOMMAND $WNPPTMP http://www.debian.org/devel/wnpp/requested || \ { echo "${0##*/}: $CURLORWGET http://www.debian.org/devel/wnpp/requested failed." >&2; exit 1; } -sed -ne 's/.*<li><a href="http:\/\/bugs.debian.org\/\([0-9]*\)">\([^:<]*\)[: ]*\([^<]*\)<\/a>.*/RFP \1 \2 -- \3/; T d; p; : d' $WNPPTMP >> $WNPP +sed -ne 's/.*<li><a href="https\?:\/\/bugs.debian.org\/\([0-9]*\)">\([^:<]*\)[: ]*\([^<]*\)<\/a>.*/RFP \1 \2 -- \3/; T d; p; : d' $WNPPTMP >> $WNPP awk -F' ' '{print "("$1" - #"$2") http://bugs.debian.org/"$2"; "$3}' $WNPP | sort -k 5 > $WNPP_PACKAGES -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
