summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-05-05 19:34:07 +0200
committerDan McGee <dan@archlinux.org>2012-05-21 00:38:33 +0200
commitc2fdc38b78d9b83e783ff2ec3f8c4d53e7f45634 (patch)
treebe798a318162416f5e9a5e4b38c86420cf28b1b3
parentceb23622097bb59ef568fd2565d71148069664c8 (diff)
downloadpacman-c2fdc38b78d9b83e783ff2ec3f8c4d53e7f45634.tar.gz
pacman-c2fdc38b78d9b83e783ff2ec3f8c4d53e7f45634.tar.xz
pacman: support group selection delimited by commas
We support multiple arguments being comma separated elsewhere, so this seems like a natural extension to support in our multiparse selection code. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--doc/pacman.8.txt8
-rw-r--r--src/pacman/util.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 275cf965..3b858037 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -70,10 +70,10 @@ Operations
In addition to packages, groups can be specified as well. For example, if
gnome is a defined package group, then `pacman -S gnome` will provide a
prompt allowing you to select which packages to install from a numbered list.
-The package selection is specified using a space separated list of package
-numbers. Sequential packages may be selected by specifying the first and last
-package numbers separated by a hyphen (`-`). Excluding packages is achieved by
-prefixing a number or range of numbers with a caret (`^`).
+The package selection is specified using a space and/or comma separated list of
+package numbers. Sequential packages may be selected by specifying the first
+and last package numbers separated by a hyphen (`-`). Excluding packages is
+achieved by prefixing a number or range of numbers with a caret (`^`).
+
Packages that provide other packages are also handled. For example, `pacman -S
foo` will first look for a foo package. If foo is not found, packages that
diff --git a/src/pacman/util.c b/src/pacman/util.c
index e8140d0f..7f7f6a74 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -1304,7 +1304,7 @@ static int multiselect_parse(char *array, int count, char *response)
int start, end;
size_t len;
char *ends = NULL;
- char *starts = strtok_r(str, " ", &saveptr);
+ char *starts = strtok_r(str, " ,", &saveptr);
if(starts == NULL) {
break;