summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-04-08 13:26:41 -0400
committerDan McGee <dan@archlinux.org>2012-04-24 08:38:36 -0500
commit3f9cf8471f9c6faecba8e09deb97a8d042525307 (patch)
treef53931828fb4ecdbf383e5c2a590e1018403485e
parentd85c71865ee826041c85cd47189ea43b44ce52cc (diff)
makepkg: allow specifying --pkg multiple times
Make this option additive, so that the following two operations are equivalent: makepkg --pkg foo --pkg bar makepkg --pkg foo,bar
-rw-r--r--doc/makepkg.8.txt2
-rw-r--r--scripts/makepkg.sh.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index f80d7f20..57af98f7 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -154,7 +154,7 @@ Options
*\--pkg <list>*::
Only build listed packages from a split package. Multiple packages should
- be comma separated in the list.
+ be comma separated in the list. This option can be specified multiple times.
*\--check*::
Run the check() function in the PKGBUILD, overriding the setting in
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 663fdc68..959c6b00 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1998,7 +1998,7 @@ while true; do
--nosign) SIGNPKG='n' ;;
-o|--nobuild) NOBUILD=1 ;;
-p) shift; BUILDFILE=$1 ;;
- --pkg) shift; IFS=, read -ra PKGLIST <<<"$1" ;;
+ --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;;
-r|--rmdeps) RMDEPS=1 ;;
-R|--repackage) REPKG=1 ;;
--skipchecksums) SKIPCHECKSUMS=1 ;;