[arch-projects] [devtools] [PATCH 2/4] archrelease: Check for subdirectories early

Lukas Fleischer archlinux at cryptocrack.de
Fri Aug 19 04:16:48 EDT 2011


Ensure we do not mess with version control if there are any
subdirectories in the package trunk.

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

diff --git a/archrelease b/archrelease
index ec7545e..0fb3445 100755
--- a/archrelease
+++ b/archrelease
@@ -31,6 +31,12 @@ fi
 
 echo -n "releasing package to ${1}..."
 pushd .. >/dev/null
+IFS=$'\n' read -r -d '' -a known_files < <(svn ls "trunk")
+for file in "${known_files[@]}"; do
+	if [[ ${file:(-1)} = '/' ]]; then
+		abort "archrelease: subdirectories are not supported in package directories!"
+	fi
+done
 if [[ -d repos/$1 ]]; then
 	declare -a trash
 	while read -r file; do
@@ -41,12 +47,6 @@ else
 	mkdir -p "repos/${1}"
 	svn add --parents -q "repos/${1}"
 fi
-IFS=$'\n' read -r -d '' -a known_files < <(svn ls "trunk")
-for file in "${known_files[@]}"; do
-	if [[ ${file:(-1)} = '/' ]]; then
-		abort "archrelease: subdirectories are not supported in package directories!"
-	fi
-done
 for file in "${known_files[@]}"; do
 	svn copy -q -r HEAD "trunk/$file" "repos/${1}/"
 done
-- 
1.7.6



More information about the arch-projects mailing list