r12109 - /scripts/qa/packagecheck

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

Author: gregoa-guest
Date: Sun Jan  6 07:15:02 2008
New Revision: 12109

URL: http://svn.debian.org/wsvn/?sc=1&rev=12109
Log:
packagecheck: testrmdir(): add checks for rm -r

Modified:
    scripts/qa/packagecheck

Modified: scripts/qa/packagecheck
URL: http://svn.debian.org/wsvn/scripts/qa/packagecheck?rev=12109&op=diff
==============================================================================
--- scripts/qa/packagecheck (original)
+++ scripts/qa/packagecheck Sun Jan  6 07:15:02 2008
@@ -21,10 +21,10 @@
 	echo "  At least one parameter must be present."
 	echo
 	echo "  Parameters:"
-	echo "  -V debian/control: add Vcs-(Svn|Browser) fields; remove XS-Vcs-(Svn|Browser) fields"
-	echo "  -H debian/control: add Homepage field; remove pseudo-field Homepage"
-	echo "  -W debian/watch:   change CPAN URLs to http://search.cpan.org/dist/Mod-Ule/"
-	echo "  -R debian/rules:   rmdir /usr/\{lib,share\}/perl5 only if they exist"
+	echo "  -V debian/control: add _V_cs-(Svn|Browser) fields; remove XS-Vcs-(Svn|Browser) fields"
+	echo "  -H debian/control: add _H_omepage field; remove pseudo-field Homepage"
+	echo "  -W debian/_w_atch: change CPAN URLs to http://search.cpan.org/dist/Mod-Ule/"
+	echo "  -R debian/rules:   _r_mdir /usr/\{lib,share\}/perl5 only if they exist"
 	echo "  -A all checks"
 	echo "  -h this help"
 	exit 1
@@ -118,7 +118,7 @@
 
 testrmdir() {
 	# handle rmdir /usr/{share,lib}/perl5
-	if grep -m 1 "rmdir.*ignore-fail-on-non-empty" $TRUNK/$1/debian/rules | grep -v "\[ \! -d" > /dev/null ; then
+	if egrep -m 1 "(rmdir.*ignore-fail-on-non-empty|rm -r.*usr/(lib|share)(/perl5)?$)" $TRUNK/$1/debian/rules | grep -v "\[ \! -d" > /dev/null ; then
 		ARCH=$(grep -m 1 -h "Architecture:" $TRUNK/$1/debian/control | awk '{print $2;}')
 		case $ARCH in
 			any)
@@ -132,6 +132,10 @@
 		esac
 		echo "$1: trying to make rmdir /usr${DELDIR} conditional"
 		if perl -i -e "my \$changed=1; while(<>){ \$changed=0 if s{rmdir.*ignore-fail-on-non-empty.*\s(\S+)$DELDIR}{[ ! -d \$1${DELDIR} ] || rmdir --ignore-fail-on-non-empty --parents --verbose \$1${DELDIR}}; print;} exit \$changed" $TRUNK/$1/debian/rules ; then
+			MSG_RULES="debian/rules: delete /usr${DELDIR} only if it exists." && \
+			CHANGED=1
+		fi
+		if perl -i -e "my \$changed=1; while(<>){ \$changed=0 if s{-?rm -r.* (.*usr)/(?:lib|share)(?:/perl5)?\$}{[ ! -d \$1${DELDIR} ] || rmdir --ignore-fail-on-non-empty --parents --verbose \$1${DELDIR}}; print;} exit \$changed" $TRUNK/$1/debian/rules ; then
 			MSG_RULES="debian/rules: delete /usr${DELDIR} only if it exists." && \
 			CHANGED=1
 		fi
@@ -212,16 +216,16 @@
 	MSG_WATCH=
 	MSG_RULES=
 
-	# TESTVCS - -V debian/control: add Vcs-(Svn|Browser) fields; remove XS-Vcs-(Svn|Browser) field
+	# TESTVCS - -V debian/control: add _V_cs-(Svn|Browser) fields; remove XS-Vcs-(Svn|Browser) field
 	[ "$TESTVCS" = 1 ] && testvcs $p
 
-	# TESTHOMEPAGE - -H debian/control: add Homepage field; remove pseudo-field Homepage
+	# TESTHOMEPAGE - -H debian/control: add _H_omepage field; remove pseudo-field Homepage
 	[ "$TESTHOMEPAGE" = 1 ] && testhomepage $p
 
-	# TESTWATCHDIST - -W debian/watch:   change CPAN URLs to http://search.cpan.org/dist/Mod-Ule/
+	# TESTWATCHDIST - -W debian/_w_atch: change CPAN URLs to http://search.cpan.org/dist/Mod-Ule/
 	[ "$TESTWATCHDIST" = 1 ] && testwatchdist $p
 	
-	# TESTRMDIR - -R debian/rules:   rmdir /usr/\{lib,share\}/perl5 only if they exist
+	# TESTRMDIR - -R debian/rules: _r_mdir /usr/\{lib,share\}/perl5 only if they exist
 	[ "$TESTRMDIR" = 1 ] && testrmdir $p
 	
 	# changelog