r28656 - in /scripts: qa/packagecheck takeover-for-pkg-perl.sh

ryan52-guest at users.alioth.debian.org ryan52-guest at users.alioth.debian.org
Sun Dec 28 06:47:56 UTC 2008


Author: ryan52-guest
Date: Sun Dec 28 06:47:52 2008
New Revision: 28656

URL: http://svn.debian.org/wsvn/?sc=1&rev=28656
Log:
add an auto option to packagecheck

Modified:
    scripts/qa/packagecheck
    scripts/takeover-for-pkg-perl.sh

Modified: scripts/qa/packagecheck
URL: http://svn.debian.org/wsvn/scripts/qa/packagecheck?rev=28656&op=diff
==============================================================================
--- scripts/qa/packagecheck (original)
+++ scripts/qa/packagecheck Sun Dec 28 06:47:52 2008
@@ -24,6 +24,7 @@
 	echo "  At least one parameter must be present."
 	echo
 	echo "  Parameters:"
+        echo "  -a       - automatic"
 	echo "  -V       - debian/control: add _V_cs-(Svn|Browser) fields;"
 	echo "             remove XS-Vcs-(Svn|Browser) fields;"
 	echo "             switch Vcs-Browser fields to ViewSVN"
@@ -290,8 +291,11 @@
 
 ONLY_CURDIR=""
 
-while getopts p:cVHMDWCRQAh O; do
+while getopts p:acVHMDWCRQAh O; do
 	case "$O" in
+                a)
+                        AUTO=1
+                        ;;
 		p)
 			PKG=$OPTARG
 			;;
@@ -414,8 +418,10 @@
 sanity_check;
 [ "$?" -ne "0" ] && exit 1;
 
-echo "Running svn up $WORK_DIR ..."
-svn up $WORK_DIR
+if [ $AUTO -ne 1 ]; then
+    echo "Running svn up $WORK_DIR ..."
+    svn up $WORK_DIR
+fi
 
 echo "Checking if $WORK_DIR is clean ..."
 UNCLEAN=$(svn st $WORK_DIR |egrep -v '^\?')
@@ -445,6 +451,7 @@
 if [ "$CHANGED" = "1" ]; then
 
 	read -p "Show svn diff $WORK_DIR (y|N)? " DIFF
+        if [ $AUTO -ne 1 ]; then
 	case $DIFF in
 		y|Y)
 			$CMD_SVN_DIFF $WORK_DIR | less -R
@@ -452,18 +459,23 @@
 		*)
 			;;
 	esac
-
+        fi
+        COMMIT_MSG="[packagecheck] fixed Vcs-(Svn|Browser)/Homepage field(s) in debian/control and/or URL in debian/watch and/or rmdir /usr/{lib|share}/perl5 in debian/rules."
 	if [ -n "$UNCLEAN" ]; then
 		echo $WORK_DIR was not clean at start. Please commit manually.
 	else
+            if [ $AUTO -ne 1 ]; then
 		read -p "Commit $WORK_DIR (y|N)? " COMMIT
 		case $COMMIT in
 			y|Y)
-				svn ci -m "[packagecheck] fixed Vcs-(Svn|Browser)/Homepage field(s) in debian/control and/or URL in debian/watch and/or rmdir /usr/{lib|share}/perl5 in debian/rules." $WORK_DIR
+				svn ci -m "$COMMIT_MSG" $WORK_DIR
 				;;
 			*)
 				;;
 		esac
+            else # AUTO
+                svn ci -m "$COMMIT_MSG" $WORK_DIR
+            fi
 	fi
 
 else

Modified: scripts/takeover-for-pkg-perl.sh
URL: http://svn.debian.org/wsvn/scripts/takeover-for-pkg-perl.sh?rev=28656&op=diff
==============================================================================
--- scripts/takeover-for-pkg-perl.sh (original)
+++ scripts/takeover-for-pkg-perl.sh Sun Dec 28 06:47:52 2008
@@ -76,7 +76,7 @@
     svn ci $TRUNK/$PACKAGE/debian/changelog -m 'Document the takeover'
 
     if [ -x $TRUNK/../scripts/qa/packagecheck ]; then
-        yes | $TRUNK/../scripts/qa/packagecheck -A -C -p "$PACKAGE" "$TRUNK"
+        $TRUNK/../scripts/qa/packagecheck -a -A -C -p "$PACKAGE" "$TRUNK"
     else
         echo "Couldn't find packagecheck, skipping..." >/dev/stderr
     fi




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