[Blends-commit] [SCM] website branch, master, updated. b37ad5cb19ef9a74cdc85506eb8c17def50dc0c4

[Andreas Tille]

The following commit has been merged in the master branch:
commit b37ad5cb19ef9a74cdc85506eb8c17def50dc0c4
Author: Andreas Tille <tille at debian.org>
Date:   Tue Sep 17 14:44:51 2013 +0200

    Download only relevent logs; add --all option to create full senitinel pages; bugs pages should not be created currently - the code is rewritten and close to be finished, old code is hammering UDD to hard

diff --git a/misc/tools/blends_websentinel_update b/misc/tools/blends_websentinel_update
index c3d3d95..a353f61 100755
--- a/misc/tools/blends_websentinel_update
+++ b/misc/tools/blends_websentinel_update
@@ -7,6 +7,7 @@ Usage: $0 [options] <blend>
 Description: Update web sentinel parts on alioth.debian.org
 
 Options:
+    -a|--all         tasks + bugs + thermometer
     -t|--tasks       tasks pages (default)
     -b|--bugs        bugs pages
     -r|--thermometer thermometer
@@ -14,8 +15,21 @@ EOT
 }
 
 do_update () {
+    if [ "$1" = "bugs" ] ; then
+        echo "$0: For technical reasons currently the generation of Bugs pages is prevented.  Please ask Andreas Tille <tille at debian.org> for details."
+        return
+    fi
     ssh "$HOST" "cd /srv/home/groups/blends/webtools; ./$1.py ${BLEND}"
-    rsync -a ${HOST}:/srv/home/groups/blends/webtools/logs/${BLEND}$2.* .
+    #  Hmmm, this seems to always return non-zero
+    #if [ "$?" != "0" ]; then
+        # echo "$0: Unable to update $1.  Did you used ssh-agent before this command?"
+        # exit 1
+    #fi
+    rsync -a ${HOST}:/srv/home/groups/blends/webtools/logs/$2 .
+    if [ "$?" != "0" ]; then
+        echo "$0: Unable to update $1.  Did you used ssh-agent before this command?"
+        exit 1
+    fi
 }
 
 if [ $# -lt 1 ] ; then
@@ -29,14 +43,21 @@ HOST=alioth.debian.org
 
 while echo "$1" | grep -q ^- ; do
     case "$1" in
+	"-a"|"--all")
+	    dotasks='yes'
+	    dobugs='yes'
+	    dothermometer='yes'
+	;;
 	"-t"|"--tasks")
 	    dotasks='yes'
 	;;
 	"-b"|"--bugs")
 	    dobugs='yes'
+	    dotasks='no'
 	;;
 	"-r"|"--thermometer")
 	    dothermometer='yes'
+	    dotasks='no'
 	;;
 	"-h"|"--host")
 	    shift
@@ -71,13 +92,13 @@ fi
 #echo BLEND = $BLEND
 
 if [ "$dotasks" = "yes" ] ; then
-    do_update tasks ""
+    do_update tasks "${BLEND}.log"
 fi
 
 if [ "$dobugs" = "yes" ] ; then
-    do_update bugs "_bugs"
+    do_update bugs "${BLEND}_bugs.*"
 fi
 
 if [ "$dothermometer" = "yes" ] ; then
-    do_update thermometer "_thermometer"
+    do_update thermometer "${BLEND}_thermometer.*"
 fi

-- 
Static and dynamic websites for Debian Pure Blends