summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <d@falconindy.com>2010-07-24 17:13:01 -0400
committerDan McGee <dan@archlinux.org>2010-07-27 10:10:55 -0500
commit7f5c486666cc99fba4029b2c059ae062b7dd7933 (patch)
tree7d7dc2148401445d59e47c67d90f19ea4f335ce9
parentfcb4f0264f2b8e0a6ed1e7eebfe00f662ba94ef2 (diff)
downloadpacman-7f5c486666cc99fba4029b2c059ae062b7dd7933.tar.xz
Always treat PKGLIST as an array.
Fixes repackaging issues when multiple package names are passed to the --pkg option. Signed-off-by: Dave Reisner <d@falconindy.com> Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 516e1d7c..562e8758 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -73,7 +73,7 @@ HOLDVER=0
BUILDFUNC=0
PKGFUNC=0
SPLITPKG=0
-PKGLIST=""
+PKGLIST=()
# Forces the pkgver of the current PKGBUILD. Used by the fakeroot call
# when dealing with svn/cvs/etc PKGBUILDs.
@@ -1585,7 +1585,7 @@ while true; do
-m|--nocolor) USE_COLOR='n' ;;
-o|--nobuild) NOBUILD=1 ;;
-p) shift; BUILDFILE=$1 ;;
- --pkg) shift; PKGLIST=$1 ;;
+ --pkg) shift; PKGLIST=($1) ;;
-r|--rmdeps) RMDEPS=1 ;;
-R|--repackage) REPKG=1 ;;
--skipinteg) SKIPINTEG=1 ;;
@@ -1800,7 +1800,7 @@ pkgbase=${pkgbase:-${pkgname[0]}}
if [[ -n "${PKGLIST[@]}" ]]; then
unset pkgname
- pkgname="${PKGLIST[@]}"
+ pkgname=("${PKGLIST[@]}")
fi
if (( ! SPLITPKG )); then