From a4d0a6cba591e0866c249a0c2014297bdbbfb779 Mon Sep 17 00:00:00 2001 From: Eric Bélanger Date: Tue, 18 Aug 2009 16:37:09 -0700 Subject: Fix arch parameter handling in db-remove db-remove use the arch variable to handle the arch parameter passed to the script. As the arch variable is already used in PKGBUILD, this variable conflict cause unwanted behaviour. Signed-off-by: Aaron Griffin --- db-remove | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'db-remove') diff --git a/db-remove b/db-remove index eae204e..3ba7dd7 100755 --- a/db-remove +++ b/db-remove @@ -9,10 +9,10 @@ fi packagebase="$1" reponame="$2" -arch="$3" +_arch="$3" ftppath="$FTP_BASE/$reponame/os" -svnrepo="$reponame-$arch" +svnrepo="$reponame-$_arch" [ "$UID" = "" ] && UID=$(uid) @@ -21,7 +21,7 @@ WORKDIR="$TMPDIR/db-remove.$svnrepo.$UID" cleanup() { trap '' 0 2 # unlock - repo_unlock $reponame $arch + repo_unlock $reponame $_arch rm -rf "$WORKDIR" [ "$1" ] && exit $1 } @@ -39,7 +39,7 @@ die() { trap ctrl_c 2 trap cleanup 0 -repo_lock $reponame $arch +repo_lock $reponame $_arch /bin/mkdir -p "$WORKDIR" @@ -66,10 +66,10 @@ fi cd "$WORKDIR" [ -d build/ ] || mkdir build -if [ "$arch" == "any" ]; then +if [ "$_arch" == "any" ]; then arches="i686 x86_64" else - arches="$arch" + arches="$_arch" fi # copy the db file into our working area -- cgit v1.2.3-24-g4f1b