[SCM] Git repository for devscripts branch, master, updated. v2.10.73-2-gab9083b

[James Vega]

The following commit has been merged in the master branch:
commit 2e4b23e196c361406b3ee0176b39b8b7d87c01f8
Author: James Vega <james...@debian.org>
Date:   Sun Apr 10 21:55:47 2011 -0400

    getbuildlog: Download from the new buildd pages.
    
    This allows downloading the raw build logs instead of logs wrapped in a big
    <pre>.
    
    Signed-off-by: James Vega <james...@debian.org>

diff --git a/scripts/getbuildlog.sh b/scripts/getbuildlog.sh
index 6b323f0..92a50a4 100644
--- a/scripts/getbuildlog.sh
+++ b/scripts/getbuildlog.sh
@@ -84,7 +84,7 @@ elif [ "$VERSION" = "last-all" ]; then
     VERSION=[:~+.[:alnum:]-]+
 fi
 
-PATTERN="fetch\.(cgi|php)\?&pkg=$ESCAPED_PACKAGE&ver=$VERSION&arch=$ARCH&\
+PATTERN="fetch\.(cgi|php)\?pkg=$ESCAPED_PACKAGE&arch=$ARCH&ver=$VERSION&\
 stamp=[[:digit:]]+"
 
 getbuildlog() {
@@ -93,13 +93,13 @@ getbuildlog() {
 
     trap "rm -f $ALL_LOGS" EXIT INT QUIT TERM
 
-    wget -q -O $ALL_LOGS "$BASE/build.php?&pkg=$PACKAGE"
+    wget -q -O $ALL_LOGS "$BASE/status/logs.php?pkg=$PACKAGE"
 
     # Put each href in $ALL_LOGS on a separate line so that $PATTERN
     # matches only one href. This is required because grep is greedy.
     sed -i -e "s/href=\"/\nhref=\"/g" $ALL_LOGS
     # Quick-and-dirty unescaping
-    sed -i -e "s/%2B/\+/g" -e "s/%3A/:/g" -e "s/%7E/~/g" $ALL_LOGS
+    sed -i -e "s/&amp;/\&/g" -e "s/%2B/\+/g" -e "s/%3A/:/g" -e "s/%7E/~/g" 
$ALL_LOGS
 
     # If only the last version was requested, extract and sort
     # the listed versions and determine the highest
@@ -116,8 +116,8 @@ getbuildlog() {
                print $versions[0][0]; ' | sed -e "s/\+/\\\+/g"
        )
 
-       NEWPATTERN="fetch\.(cgi|php)\?&pkg=$ESCAPED_PACKAGE&\
-ver=$LASTVERSION&\arch=$ARCH&stamp=[[:digit:]]+"
+       NEWPATTERN="fetch\.(cgi|php)\?pkg=$ESCAPED_PACKAGE&\
+arch=$ARCH&ver=$LASTVERSION&stamp=[[:digit:]]+"
     else
        NEWPATTERN=$PATTERN
     fi
@@ -128,7 +128,7 @@ ver=$LASTVERSION&\arch=$ARCH&stamp=[[:digit:]]+"
        arch=${match##*arch=}
        arch=${arch%%&*}
        match=`echo $match | sed -e 's/\+/%2B/g'`
-        wget -O "${PACKAGE}_${ver}_${arch}.log" "$BASE/$match&file=log"
+        wget -O "${PACKAGE}_${ver}_${arch}.log" "$BASE/status/$match&raw=1"
     done
 
     rm -f $ALL_LOGS

-- 
Git repository for devscripts


-- 
To unsubscribe, send mail to pkg-devscripts-unsubscr...@teams.debian.net.