diff options
author | Xavier Chantry <chantry.xavier@gmail.com> | 2010-10-16 12:28:01 +0200 |
---|---|---|
committer | Xavier Chantry <chantry.xavier@gmail.com> | 2011-01-29 19:33:15 +0100 |
commit | 4097c98c1ee65d6b3a659d042c6c84e0632673bf (patch) | |
tree | 2468e89522839b9e2d8f66cddc11c23076c8be0a /test | |
parent | ba97a22ce10df2966a9e1117b48a84b93eae0538 (diff) | |
download | pacman-4097c98c1ee65d6b3a659d042c6c84e0632673bf.tar.gz pacman-4097c98c1ee65d6b3a659d042c6c84e0632673bf.tar.xz |
Add interactive provider selection
If there are multiple providers in one db, pacman used to just stop at
the first one (both during dependency resolution or for pacman -S
'provision' which uses the same code).
This adds a new conversation callback so that the user can choose which
provider to install. By default (user press enter or --noconfirm), the
first provider is still chosen, so for example the behavior of sync402
and 403 is preserved. But at least the user now has the possibility to
make the right choice in a manual run.
If one of the provider is already installed, it is picked for
reinstall/upgrade, so that provision 002/003 pactest now pass.
$ pacman -S community/smtp-server
:: There are 3 providers available for smtp-server:
1) courier-mta 2) esmtp 3) exim
Which one do you want to install?
Enter a number (default=1):
Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/pacman/tests/provision002.py | 2 | ||||
-rw-r--r-- | test/pacman/tests/provision003.py | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/test/pacman/tests/provision002.py b/test/pacman/tests/provision002.py index 49b88a18..46deb1da 100644 --- a/test/pacman/tests/provision002.py +++ b/test/pacman/tests/provision002.py @@ -18,5 +18,3 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") self.addrule("PKG_VERSION=pkg2|1.0-2") - -self.expectfailure = True diff --git a/test/pacman/tests/provision003.py b/test/pacman/tests/provision003.py index 9308be6e..08647501 100644 --- a/test/pacman/tests/provision003.py +++ b/test/pacman/tests/provision003.py @@ -19,5 +19,3 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") self.addrule("PKG_VERSION=pkg2|1.0-2") - -self.expectfailure = True |