From 4a281ed9dcc130e1c5615800eb3ec622c7f51449 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Mon, 9 Jul 2012 18:48:36 +0200
Subject: [PATCH] autodist-cgi: print location of ok log file in output log
 autodist: sync with current minor changes

---
 autodist     |  1 +
 autodist-cgi | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/autodist b/autodist
index 84b403f..09b7988 100755
--- a/autodist
+++ b/autodist
@@ -706,6 +706,7 @@ function launch_pkgs_loop() {
             echo
 	    echo " OK" >> $LOGFILE
    	    mv $LOGFILE_PKG $LOGDIR/ok/
+            echo "?= See $LOGDIR/ok/${LOGFILE_PKG_NAME}"
 
             case $operation in
                prepare)
diff --git a/autodist-cgi b/autodist-cgi
index b986088..b1452fc 100755
--- a/autodist-cgi
+++ b/autodist-cgi
@@ -87,22 +87,22 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
       [[ "$NUM" && "$NUM" != "$i" ]] && continue
       [[ "$SECONDARY" = "$AS_SECONDARY" ]] || continue
       if [ "${AUTOPORT_UPDATE[$i]}" ]; then
-         echo "<b>* ${AUTOPORT_REPOSITORIES[$i]}(${AUTOPORT_ARCH[$i]}) (type:autodist update)"
+         echo "<b>* <a href=\"?NUM=$i&SECONDARY=$AS_SECONDARY\">${AUTOPORT_REPOSITORIES[$i]}</a>(${AUTOPORT_ARCH[$i]}) (type:autodist update)"
          echo " [ <a href=\"?SHOWLOG=current&NUM=$i$SECONDARY_ADD\">log</a> <a href=\"?SHOWLOG=last&NUM=$i$SECONDARY_ADD\">last</a> ]</b>"
       fi
 
       if [ "${AUTOPORT_CHROOT[$i]}" ]; then
-         echo "<b>* ${AUTOPORT_REPOSITORIES[$i]}(${AUTOPORT_ARCH[$i]}) (type:chroot autoport</a> chroot:${AUTOPORT_CHROOT[$i]})"
+         echo "<b>* <a href=\"?NUM=$i&SECONDARY=$AS_SECONDARY\">${AUTOPORT_REPOSITORIES[$i]}</a>(${AUTOPORT_ARCH[$i]}) (type:chroot autoport</a> chroot:${AUTOPORT_CHROOT[$i]})"
          echo " [ <a href=\"?SHOWLOG=current&NUM=$i$SECONDARY_ADD\">log</a> <a href=\"?SHOWLOG=last&NUM=$i$SECONDARY_ADD\">last</a> ]</b>"
       fi
 
       if [ "${AUTOPORT_NATIVE[$i]}" ]; then
-         echo "<b>* ${AUTOPORT_REPOSITORIES[$i]}(${AUTOPORT_ARCH[$i]}) (type:native autoport)"
+         echo "<b>* <a href=\"?NUM=$i&SECONDARY=$AS_SECONDARY\">${AUTOPORT_REPOSITORIES[$i]}</a>(${AUTOPORT_ARCH[$i]}) (type:native autoport)"
          echo " [ <a href=\"?SHOWLOG=current&NUM=$i$SECONDARY_ADD\">log</a> <a href=\"?SHOWLOG=last&NUM=$i$SECONDARY_ADD\">last</a> ]</b>"
       fi
 
       if [ "${AUTOPORT_CROSS[$i]}" ]; then
-         echo "<b>* <a href=\"?SHOWLOG=current&NUM=$i$SECONDARY_ADD\">cross-platform</a> autoport (arch:${AUTOPORT_CROSS[$i]})</b>"
+         echo "<b>* <a href=\"?NUM=$i&SECONDARY=$AS_SECONDARY\">cross-platform</a> autoport (arch:${AUTOPORT_CROSS[$i]})</b>"
          echo " [ <a href=\"?SHOWLOG=current&NUM=$i$SECONDARY_ADD\">last</a> ]</b>"
       fi
       echo "<pre>"
@@ -185,7 +185,11 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
          echo "<b>Scheduled jobs:</b> $SCHEDULED"
          for b in `seq 1 ${#BUILDNOW[*]}`; do
             set -- ${BUILDNOW[$b-1]}
-            echo "<b><a href=\"?SHOWLOG=${BUILDLOG[$b-1]}&NUM=$i$SECONDARY_ADD\">$1</a>:</b> $2 $3 $4 $5 $6 "
+            if [ "${BUILDLOG[$b-1]}" ]; then
+               echo "<b><a href=\"?SHOWLOG=${BUILDLOG[$b-1]}&NUM=$i$SECONDARY_ADD\">$1</a>:</b> $2 $3 $4 $5 $6 "
+            else
+               echo "<b>$1:</b> $2 $3 $4 $5 $6 "
+            fi
          done
          if [ "$LASTLINE" ]; then
             set -- $LASTLINE