r7936 - /scripts/qa/packagecheck

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Sep 25 17:38:18 2007
New Revision: 7936

URL: http://svn.debian.org/wsvn/?sc=1&rev=7936
Log:
Warn and don't commit at the end if the trunk was not clean in the start

Modified:
    scripts/qa/packagecheck

Modified: scripts/qa/packagecheck
URL: http://svn.debian.org/wsvn/scripts/qa/packagecheck?rev=7936&op=diff
==============================================================================
--- scripts/qa/packagecheck (original)
+++ scripts/qa/packagecheck Tue Sep 25 17:38:18 2007
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007 gregor herrmann <gregor+debian at comodo.priv.at>
+# Copyright 2007 Damyan Ivanov <dmn at debian.org>
 # Released under the terms of the GNU GPL version 2
 #
 # 1) Checks for and adds missing XS-Vcs-(Svn|Browser) fields 
@@ -12,6 +13,12 @@
 
 echo "Running svn up trunk/ ..."
 svn up trunk/
+
+UNCLEAN=$(svn st trunk|egrep -v '^\?')
+if [ -n "$UNCLEAN" ]; then
+    echo "$UNCLEAN"
+    echo WARNING: trunk is not clean
+fi
 
 echo "Grepping through packages ..."
 for p in $(ls trunk -1); do 
@@ -91,15 +98,19 @@
 			;;
 	esac
 
-	read -p "Commit (y|N)? " COMMIT
-	case $COMMIT in
-		y|Y)
-			svn ci -m "Add missing XS-Vcs-(Svn|Browser) field(s) to debian/control." trunk/
-			break
-			;;
-		*)
-			;;
-	esac
+        if [ -n "$UNCLEAN" ]; then
+            echo trunk was not clean at start. Please commit manually.
+        else
+            read -p "Commit (y|N)? " COMMIT
+            case $COMMIT in
+                y|Y)
+                svn ci -m "Add missing XS-Vcs-(Svn|Browser) field(s) to debian/control." trunk/
+                break
+                ;;
+                *)
+                ;;
+            esac
+        fi
 
 else
 	echo "Nothing changed."