r5867 - /scripts/qa/versioncheck-html

Thu Jul 19 09:39:34 UTC 2007

Author: dmn
Date: Thu Jul 19 09:39:34 2007
New Revision: 5867

URL: http://svn.debian.org/wsvn/?sc=1&rev=5867
Log:
Integrate Incoming and NEW columns into Archive

Work correctly with native packages

Modified:
    scripts/qa/versioncheck-html

Modified: scripts/qa/versioncheck-html
URL: http://svn.debian.org/wsvn/scripts/qa/versioncheck-html?rev=5867&op=diff
==============================================================================

--- scripts/qa/versioncheck-html (original)
+++ scripts/qa/versioncheck-html Thu Jul 19 09:39:34 2007
@@ -21,7 +21,7 @@
 echo "<html>"
 echo "<body>"
 echo "<table border=\"1\">"
-echo "<tr><th>Package</th><th>Repository</th><th>Archive</th><th>Incoming</th><th>NEW</th><th>upstream</th></tr>"
+echo "<tr><th>Package</th><th>Repository</th><th>Archive</th><th>upstream</th></tr>"
 
 # loop over packages
 for SECTION in packages tools; do
@@ -36,9 +36,9 @@
 
 		cat /dev/null > /$DIR/watch
 		svn cat $REPO/$SECTION/${P}/trunk/debian/watch > $DIR/watch
-		UPCUR=$(echo $PA | perl -pe 's/^(?:\d:)?(.+)-[^-]+$/\1/')
+		UPCUR=$(echo $RE | perl -pe 's/^(?:\d:)?(.+?)(?:-[^-]+)?$/\1/')
 		if [ -s $DIR/watch ]; then
-			if egrep -q '^(ftp|http).+cpan' $DIR/watch; then
+			if egrep -qi '^(ftp|http).+cpan' $DIR/watch; then
 				VER_REGEX=$(egrep '^http|^ftp' $DIR/watch | perl -pe 's{.+/}{}; s/\s.*$//')
 				if [ -n "$VER_REGEX" ]; then
 					UPNEW=$(perl -ne "if(/${VER_REGEX}/){ print \$1; last }" $DIR/cpan)
@@ -52,16 +52,22 @@
 				UPNEW=$(uscan --watchfile $DIR/watch --upstream-version $UPCUR --package $P --report-status | perl -ne 'print if s/Newest version on remote site is (.+),.*/\1/')
 			fi
 		else
-			UPNEW="no debian/watch"
+			if echo "$RE" | egrep -q -- '-.+$'; then
+				UPNEW="no debian/watch"
+			else
+				# native package
+				UPNEW=$RE
+			fi
 		fi
 
 		if [ "$UPCUR" != "$UPNEW" -o "$RE" != "$PA" -a "$RE" != "$IN" -a "$RE" != "$NE" ]; then
 			echo "<tr>"
 			echo "<td>$P</td>"
-			echo "<td>${RE:-&nbsp;}</td>"
-			echo "<td>${PA:-&nbsp;}</td>"
-			echo "<td>${IN:-&nbsp;}</td>"
-			echo "<td>${NE:-&nbsp;}</td>"
+			echo "<td>${RE:--}</td>"
+			echo "<td>${PA:--}"
+			[ -n "$IN" ] && echo "Incoming:&nbsp;$IN"
+			[ -n "$NE" ] && echo "NEW:&nbsp;$NE"
+			echo "</td>"
 			if [ "$UPCUR" != "$UPNEW" ] ; then 
 				echo "<td>${UPNEW:-???}</td>"
 			else


