summaryrefslogtreecommitdiff
path: root/testing2x
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-11-21 17:14:10 -0800
committerAaron Griffin <aaronmgriffin@gmail.com>2008-11-21 17:14:10 -0800
commit3606df775189459eef24fdec2bad5cab6ccc7ec6 (patch)
tree26c55bd807eaa0cabc7930d8c1a965c6d0ac1f74 /testing2x
parent9960434e090fc4a02adb2434c6f941c725642158 (diff)
Fix a variable overwrite when sourcing PKGBUILDs
The local variable 'arch' was being overwritten when we source PKGBUILDs. Change it to _arch wherever we deal with PKGBUILD files Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
Diffstat (limited to 'testing2x')
-rwxr-xr-xtesting2x16
1 files changed, 8 insertions, 8 deletions
diff --git a/testing2x b/testing2x
index a5e3098..6a3a70e 100755
--- a/testing2x
+++ b/testing2x
@@ -6,10 +6,10 @@ source_makepkg
case "$0" in
*64)
- arch="x86_64"
+ _arch="x86_64"
;;
*)
- arch="i686"
+ _arch="i686"
;;
esac
WORKDIR="$TMPDIR/testing2x.$UID"
@@ -36,20 +36,20 @@ cd checkout
for pkg in $*; do
moved=0
/usr/bin/svn up -q ${pkg}
- if [ -f "${pkg}/repos/testing-${arch}/${BUILDSCRIPT}" ]; then
+ if [ -f "${pkg}/repos/testing-${_arch}/${BUILDSCRIPT}" ]; then
for repo in core extra; do
- if [ -f "${pkg}/repos/${repo}-${arch}/${BUILDSCRIPT}" ]; then
- echo "===> Moving package '${pkg}': testing-${arch} -> ${repo}-${arch}"
- $(dirname $0)/db-move "${pkg}" "testing" "${repo}" "${arch}"
+ if [ -f "${pkg}/repos/${repo}-${_arch}/${BUILDSCRIPT}" ]; then
+ echo "===> Moving package '${pkg}': testing-${_arch} -> ${repo}-${_arch}"
+ $(dirname $0)/db-move "${pkg}" "testing" "${repo}" "${_arch}"
moved=1
break
fi
done
if [ ${moved} -eq 0 ]; then
- echo "===> Warning: ${pkg} is only in testing-${arch}, cannot determine where to move it"
+ echo "===> Warning: ${pkg} is only in testing-${_arch}, cannot determine where to move it"
fi
else
- echo "===> Warning: ${pkg} is not in testing-${arch}"
+ echo "===> Warning: ${pkg} is not in testing-${_arch}"
fi
done