r11486 - in /scripts/qa: DebianQA/Watch.pm packagecheck

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Sat Dec 22 22:34:55 2007
New Revision: 11486

URL: http://svn.debian.org/wsvn/?sc=1&rev=11486
Log:
drop .rar from regexen that match upstream packages

Modified:
    scripts/qa/DebianQA/Watch.pm
    scripts/qa/packagecheck

Modified: scripts/qa/DebianQA/Watch.pm
URL: http://svn.debian.org/wsvn/scripts/qa/DebianQA/Watch.pm?rev=11486&op=diff
==============================================================================
--- scripts/qa/DebianQA/Watch.pm (original)
+++ scripts/qa/DebianQA/Watch.pm Sat Dec 22 22:34:55 2007
@@ -337,7 +337,7 @@
             next;
         }
         next unless($type
-                and /^[-l]r.....r.*\.(?:bz2|gz|rar|zip|pl|pm|tar|tgz)$/i);
+                and /^[-l]r.....r.*\.(?:bz2|gz|zip|pl|pm|tar|tgz)$/i);
         s/ -> .*//;
         my @fields = split;
         if(@fields >= 9 and $fields[8] ne "CHECKSUMS") {
@@ -359,7 +359,6 @@
                         )?
                         | \.tgz     # or .tgz
                         | \.zip     # or .zip
-                        | \.rar     # or .rar
                     )
                     $           # and this is at the end
                 }x

Modified: scripts/qa/packagecheck
URL: http://svn.debian.org/wsvn/scripts/qa/packagecheck?rev=11486&op=diff
==============================================================================
--- scripts/qa/packagecheck (original)
+++ scripts/qa/packagecheck Sat Dec 22 22:34:55 2007
@@ -113,7 +113,7 @@
 	# 6) watchfile
 	if [ -e $TRUNK/$p/debian/watch ] && ! grep search\.cpan\.org/dist/ $TRUNK/$p/debian/watch >/dev/null; then
 		echo "$p: trying to change URL in debian/watch"
-		if perl -i -e "my \$changed=1; while(<>){ \$changed=0 if s{(?:^|\s+)(?:ht|f)tp://.*cpan.+/\s*(\S+)-(?:\S+)(\s.+)?$}{http://search.cpan.org/dist/\$1/ .*/\$1-v?(\\\\d[\\\\d_.]+)\\\\.(?:tar(?:\\\\.gz|\\\\.bz2)?|tgz|zip|rar)\$2}i; print;} exit \$changed" $TRUNK/$p/debian/watch ; then
+		if perl -i -e "my \$changed=1; while(<>){ \$changed=0 if s{(?:^|\s+)(?:ht|f)tp://.*cpan.+/\s*(\S+)-(?:\S+)(\s.+)?$}{http://search.cpan.org/dist/\$1/ .*/\$1-v?(\\\\d[\\\\d_.]+)\\\\.(?:tar(?:\\\\.gz|\\\\.bz2)?|tgz|zip)\$2}i; print;} exit \$changed" $TRUNK/$p/debian/watch ; then
 			perl -pi -e "s;^version=2;version=3;" $TRUNK/$p/debian/watch
 			MSG_WATCH="debian/watch: use dist-based URL."
 			CHANGED=1