r6013 - in /scripts/qa: maintainercheck versioncheck versioncheck-html versioncheck.pl

gregoa-guest at users.alioth.debian.org gregoa-guest at users.alioth.debian.org
Sun Jul 29 20:43:09 UTC 2007


Author: gregoa-guest
Date: Sun Jul 29 20:43:08 2007
New Revision: 6013

URL: http://svn.debian.org/wsvn/?sc=1&rev=6013
Log:
prepare qa-scripts for the new repository layout

Modified:
    scripts/qa/maintainercheck
    scripts/qa/versioncheck
    scripts/qa/versioncheck-html
    scripts/qa/versioncheck.pl

Modified: scripts/qa/maintainercheck
URL: http://svn.debian.org/wsvn/scripts/qa/maintainercheck?rev=6013&op=diff
==============================================================================
--- scripts/qa/maintainercheck (original)
+++ scripts/qa/maintainercheck Sun Jul 29 20:43:08 2007
@@ -5,11 +5,10 @@
 
 . $(dirname $0)/commoncheck
 
-for P in $(svn ls $REPO/packages/); do
+for P in $(svn ls $REPO/trunk/); do
 	P=${P%/}
-	[ "$P" = "attic" ] && continue
 	CONTROL="$(mktemp).$P.control"
-	svn export $REPO/packages/$P/trunk/debian/control $CONTROL > /dev/null
+	svn export $REPO/trunk/$P/debian/control $CONTROL > /dev/null
 	if ! grep "Maintainer:.*pkg-perl-maintainers at lists\.alioth\.debian\.org" $CONTROL > /dev/null ; then
 		echo $P
 		egrep "(Maintainer|Uploaders)" $CONTROL | sort

Modified: scripts/qa/versioncheck
URL: http://svn.debian.org/wsvn/scripts/qa/versioncheck?rev=6013&op=diff
==============================================================================
--- scripts/qa/versioncheck (original)
+++ scripts/qa/versioncheck Sun Jul 29 20:43:08 2007
@@ -16,25 +16,22 @@
 wget -q -O- http://ftp-master.debian.org/new.html | html2text -nobs -width 255 > $DIR/newqueue
 
 # loop over packages
-for SECTION in packages tools; do
-	for P in $(svn ls $REPO/$SECTION/); do
-		P=$(echo $P | sed -e 's;/;;')
-		[ "$P" = "attic" ] && continue
+for P in $(svn ls $REPO/trunk/); do
+	P=$(echo $P | sed -e 's;/;;')
 
-		PA=$(grep -A 1 $P $DIR/Packages | grep Version | perl -pe 's/Version: //')
-		RE=$(svn cat $REPO/$SECTION/${P}/trunk/debian/changelog | grep -m 1 "$P.*unstable;" | perl -pe 's/.*\((.+)\).*/$1/')
-		IN=$(grep "$P.*\.dsc" $DIR/incoming | perl -pe 's/.*_(.+)\.dsc.*/\1/')
-		NE=$(grep $P $DIR/newqueue | perl -pe "s/.*$P\s+([^\s]+)\s+source.*/\1/g")
+	PA=$(grep -A 1 $P $DIR/Packages | grep Version | perl -pe 's/Version: //')
+	RE=$(svn cat $REPO/trunk/${P}/debian/changelog | grep -m 1 "$P.*unstable;" | perl -pe 's/.*\((.+)\).*/$1/')
+	IN=$(grep "$P.*\.dsc" $DIR/incoming | perl -pe 's/.*_(.+)\.dsc.*/\1/')
+	NE=$(grep $P $DIR/newqueue | perl -pe "s/.*$P\s+([^\s]+)\s+source.*/\1/g")
 
-		if [ "$RE" != "$PA" -a "$RE" != "$IN" -a "$RE" != "$NE" ]; then
-			echo "$P ==>"
-			echo -e "\trepository: $RE"
-			echo -e "\tpackages: $PA"
-			[ -n "$IN" ] && echo -e "\tincoming: $IN"
-			[ -n "$NE" ] && echo -e "\tnew: $NE"
-		fi
-		
-	done
+	if [ "$RE" != "$PA" -a "$RE" != "$IN" -a "$RE" != "$NE" ]; then
+		echo "$P ==>"
+		echo -e "\trepository: $RE"
+		echo -e "\tpackages: $PA"
+		[ -n "$IN" ] && echo -e "\tincoming: $IN"
+		[ -n "$NE" ] && echo -e "\tnew: $NE"
+	fi
+	
 done
 
 rm -rf $DIR

Modified: scripts/qa/versioncheck-html
URL: http://svn.debian.org/wsvn/scripts/qa/versioncheck-html?rev=6013&op=diff
==============================================================================
--- scripts/qa/versioncheck-html (original)
+++ scripts/qa/versioncheck-html Sun Jul 29 20:43:08 2007
@@ -67,75 +67,72 @@
 
 TOTAL=0
 # loop over packages
-for SECTION in packages tools; do
-	for P in $(svn ls $REPO/$SECTION/); do
-		P=$(echo $P | sed -e 's;/;;')
-		[ "$P" = "attic" ] && continue
+for P in $(svn ls $REPO/trunk/); do
+	P=$(echo $P | sed -e 's;/;;')
 
-		PA=$(grep -A 1 $P $DIR/Packages | grep Version | perl -pe 's/Version: //')
-		RE=$(svn cat $REPO/$SECTION/${P}/trunk/debian/changelog | grep -m 1 "$P.*unstable;" | perl -pe 's/.*\((.+)\).*/$1/')
-		IN=$(grep "$P.*\.dsc" $DIR/incoming | perl -pe 's/.*_(.+)\.dsc.*/\1/')
-		NE=$(grep $P $DIR/newqueue | perl -pe "s/.*$P\s+([^\s]+)\s+source.*/\1/g")
+	PA=$(grep -A 1 $P $DIR/Packages | grep Version | perl -pe 's/Version: //')
+	RE=$(svn cat $REPO/trunk/${P}/debian/changelog | grep -m 1 "$P.*unstable;" | perl -pe 's/.*\((.+)\).*/$1/')
+	IN=$(grep "$P.*\.dsc" $DIR/incoming | perl -pe 's/.*_(.+)\.dsc.*/\1/')
+	NE=$(grep $P $DIR/newqueue | perl -pe "s/.*$P\s+([^\s]+)\s+source.*/\1/g")
 
-		# Get the watch file, mangling CPAN URLs to use
-		# our fast mirror
-		cat /dev/null > /$DIR/watch
-		svn cat $REPO/$SECTION/${P}/trunk/debian/watch \
-			| sed -e "s!^http://www.cpan.org/!$CPAN/!" \
-			| sed -e "s!^ftp://www.cpan.org/!$CPAN/!" \
-			| sed -e "s!^http://backpan.perl.org/authors/!$CPAN/modules/by-author/!" \
-			| sed -e "s!^http://mirrors.kernel.org/cpan/!$CPAN/!" \
-			| sed -e "s!^ftp://mirrors.kernel.org/cpan/!$CPAN/!" \
-			> $DIR/watch
-		UPCUR=$(echo $RE | perl -pe 's/^(?:\d:)?(.+?)(?:-[^-]+)?$/\1/')
-		UPNEW=""
-		if [ -s $DIR/watch ]; then
-			if egrep -qi '^(ftp|http).+cpan' $DIR/watch; then
-				VER_REGEX=$(egrep '^http|^ftp' $DIR/watch | perl -pe 's{.+/\s*}{}; s/\s.*$//')
-				if [ -n "$VER_REGEX" ]; then
-					UPNEW=$(perl -ne "if(/\\s${VER_REGEX}\\s/){ \$last_ver = \$1 if \$1 > \$last_ver; } END { print \$last_ver } " $DIR/cpan)
-				else
-					UPNEW="Invalid debian/watch"
-				fi
-			fi
-
-			# Either unknown watch URL or a module without
-			# meta-information; fall back to uscan
-			if [ -z "$UPNEW" ]; then
-				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
-			if echo "$RE" | egrep -q -- '-.+$'; then
-				UPNEW="no debian/watch"
+	# Get the watch file, mangling CPAN URLs to use
+	# our fast mirror
+	cat /dev/null > /$DIR/watch
+	svn cat $REPO/trunk/${P}/debian/watch \
+		| sed -e "s!^http://www.cpan.org/!$CPAN/!" \
+		| sed -e "s!^ftp://www.cpan.org/!$CPAN/!" \
+		| sed -e "s!^http://backpan.perl.org/authors/!$CPAN/modules/by-author/!" \
+		| sed -e "s!^http://mirrors.kernel.org/cpan/!$CPAN/!" \
+		| sed -e "s!^ftp://mirrors.kernel.org/cpan/!$CPAN/!" \
+		> $DIR/watch
+	UPCUR=$(echo $RE | perl -pe 's/^(?:\d:)?(.+?)(?:-[^-]+)?$/\1/')
+	UPNEW=""
+	if [ -s $DIR/watch ]; then
+		if egrep -qi '^(ftp|http).+cpan' $DIR/watch; then
+			VER_REGEX=$(egrep '^http|^ftp' $DIR/watch | perl -pe 's{.+/\s*}{}; s/\s.*$//')
+			if [ -n "$VER_REGEX" ]; then
+				UPNEW=$(perl -ne "if(/\\s${VER_REGEX}\\s/){ \$last_ver = \$1 if \$1 > \$last_ver; } END { print \$last_ver } " $DIR/cpan)
 			else
-				# native package
-				UPNEW=$RE
+				UPNEW="Invalid debian/watch"
 			fi
 		fi
 
-		if [ "$UPCUR" != "$UPNEW" -o "$RE" != "$PA" -a "$RE" != "$IN" -a "$RE" != "$NE" ]; then
-			echo "<tr>"
-			echo "<td><a href=\"http://packages.qa.debian.org/$P\">$P</a> <span style=\"font-size: smaller\"><a href=\"http://bugs.debian.org/src:$P\">bts</a></span></td>"
-			echo -n "<td"
-			if [ "$RE" != "$PA" ] ; then
-				echo -n " class='upload'"
-			fi
-			echo ">${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 class='upgrade'>${UPNEW:-No upstream sources!?}</td>"
-			else
-				echo "<td>&nbsp;</td>"
-			fi
-			echo "</tr>"
+		# Either unknown watch URL or a module without
+		# meta-information; fall back to uscan
+		if [ -z "$UPNEW" ]; then
+			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
+		if echo "$RE" | egrep -q -- '-.+$'; then
+			UPNEW="no debian/watch"
+		else
+			# native package
+			UPNEW=$RE
+		fi
+	fi
 
-			TOTAL=$(( $TOTAL + 1 ))
+	if [ "$UPCUR" != "$UPNEW" -o "$RE" != "$PA" -a "$RE" != "$IN" -a "$RE" != "$NE" ]; then
+		echo "<tr>"
+		echo "<td><a href=\"http://packages.qa.debian.org/$P\">$P</a> <span style=\"font-size: smaller\"><a href=\"http://bugs.debian.org/src:$P\">bts</a></span></td>"
+		echo -n "<td"
+		if [ "$RE" != "$PA" ] ; then
+			echo -n " class='upload'"
 		fi
-		
-	done
+		echo ">${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 class='upgrade'>${UPNEW:-No upstream sources!?}</td>"
+		else
+			echo "<td>&nbsp;</td>"
+		fi
+		echo "</tr>"
+
+		TOTAL=$(( $TOTAL + 1 ))
+	fi
+	
 done
 
 echo "<tr><td colspan=\"4\"><b>TOTAL: $TOTAL</b></td></tr>"

Modified: scripts/qa/versioncheck.pl
URL: http://svn.debian.org/wsvn/scripts/qa/versioncheck.pl?rev=6013&op=diff
==============================================================================
--- scripts/qa/versioncheck.pl (original)
+++ scripts/qa/versioncheck.pl Sun Jul 29 20:43:08 2007
@@ -350,9 +350,9 @@
 my $total_shown = 0;
 my $svn = SVN::Client->new();
 
-sub check_package($$)
-{
-    my( $pkg, $section ) = @_;
+sub check_package($)
+{
+    my( $pkg ) = @_;
 
     debugmsg( "Examining $pkg\n" );
 
@@ -376,7 +376,7 @@
     eval {
         $svn->cat(
             $changelog_fh,
-            "$SVN_REPO/$section/$pkg/trunk/debian/changelog",
+            "$SVN_REPO/trunk/$pkg/debian/changelog",
             'HEAD',
         );
         my $cl = Parse::DebianChangelog->init({instring=>$changelog});
@@ -425,7 +425,7 @@
         my $watch_io = IO::Scalar->new(\$watch);
         $svn->cat(
             $watch_io,
-            "$SVN_REPO/$section/$pkg/trunk/debian/watch",
+            "$SVN_REPO/trunk/$pkg/debian/watch",
             'HEAD',
         );
 
@@ -554,26 +554,20 @@
 else
 {
 # loop over packages
-    for my $section qw(packages tools)
-    {
-        my $svn_packages = $svn->ls("$SVN_REPO/$section", 'HEAD', 0);
-
-        debugmsg(
-            sprintf(
-                "%d entries in section %s\n",
-                scalar(keys(%$svn_packages)),
-                $section,
-            ),
-        );
-
-        foreach my $pkg( sort(keys %$svn_packages) )
-        {
-            next if $pkg eq 'attic';
-
-            $total++;
-
-            $total_shown++ if check_package($pkg, $section);
-        }
+    my $svn_packages = $svn->ls("$SVN_REPO/trunk", 'HEAD', 0);
+
+    debugmsg(
+        sprintf(
+            "%d entries in trunk\n",
+            scalar(keys(%$svn_packages)),
+        ),
+    );
+
+    foreach my $pkg( sort(keys %$svn_packages) )
+    {
+        $total++;
+
+        $total_shown++ if check_package($pkg);
     }
 }
 




More information about the Pkg-perl-cvs-commits mailing list