[arch-projects] [devtools] [PATCH 3/3] commitpkg: Use positive patterns in SVN checks

Lukas Fleischer archlinux at cryptocrack.de
Wed Aug 10 09:18:00 EDT 2011


In addition to what we had before, this will also detect:

* Non-existent files.
* Files that are missing or scheduled for deletion.
* Ignored files.

Signed-off-by: Lukas Fleischer <archlinux at cryptocrack.de>
---
 commitpkg |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/commitpkg b/commitpkg
index 07c28d4..07b0994 100755
--- a/commitpkg
+++ b/commitpkg
@@ -79,7 +79,7 @@ esac
 
 # check if all local source files are under version control
 for s in "${source[@]}"; do
-	if [[ $s != *://* ]] && svn status "$s" | grep -q '^\?'; then
+	if [[ $s != *://* ]] && ! svn status -v "$s" | grep -q '^[ AMRX~]'; then
 		abort "$s is not under version control"
 	fi
 done
@@ -90,7 +90,7 @@ for i in 'changelog' 'install'; do
 	for file in $filelist; do
 		# evaluate any bash variables used
 		eval file=${file}
-		if svn status "${file}" | grep -q '^\?'; then
+		if ! svn status -v "${file}" | grep -q '^[ AMRX~]'; then
 			abort "${file} is not under version control"
 		fi
 	done
-- 
1.7.6



More information about the arch-projects mailing list