r77927 - /scripts/qa/packagecheck

[dmn at users.alioth.debian.org]

Author: dmn
Date: Wed Jul 27 19:38:45 2011
New Revision: 77927

URL: http://svn.debian.org/wsvn/?sc=1&rev=77927
Log:
require topdir when it is mandatory

Modified:
    scripts/qa/packagecheck

Modified: scripts/qa/packagecheck
URL: http://svn.debian.org/wsvn/scripts/qa/packagecheck?rev=77927&op=diff
==============================================================================
--- scripts/qa/packagecheck (original)
+++ scripts/qa/packagecheck Wed Jul 27 19:38:45 2011
@@ -477,8 +477,16 @@
 if [ -n "$ONLY_CURDIR" ]; then
 	WORK_DIR="."
 elif [ -n "$PKG" ]; then
+	if [ -z "$TOP" ]; then
+		echo "-p requires topdir" >&2
+		exit 1
+	fi
 	WORK_DIR=$TOP/packages/$PKG
 else
+	if [ -z "$TOP" ]; then
+		echo "No -c is given and there is no topdir" >&2
+		exit 1
+	fi
 	WORK_DIR=$TOP
 fi
 
@@ -491,9 +499,9 @@
 fi
 
 if [ -n "$ONLY_CURDIR" ]; then
-	check_package .
+	check_package $WORK_DIR
 elif [ -n "$PKG" ]; then
-	check_package $TOP/packages/$PKG
+	check_package $WORK_DIR
 else
 	# loop over packages
 
@@ -513,7 +521,7 @@
 		read -p "Show git diff $WORK_DIR (y|N)? " DIFF
 		case $DIFF in
 			y|Y)
-				( cd $TOP/packages; mr diff | less -R )
+				( cd $WORK_DIR; mr diff | less -R )
 				;;
 			*)
 				;;
@@ -524,7 +532,7 @@
 		read -p " $WORK_DIR (y|N)? " COMMIT
 		case $COMMIT in
 			y|Y)
-				( cd $TOP/packages; mr ci -m "$COMMIT_MSG" )
+				( cd $WORK_DIR; mr ci -m "$COMMIT_MSG" )
 				;;
 			*)
 				;;