moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

Change Y/n to y/N with REMOVE_PKGS (remove_unresolvable) callback

Browse Source 
The main reason for this change is that scripts could not catch the removed
targets with -S --noconfirm (the return value was 0). So the effect of a
pacman command may have differed from the expected one. Moreover, for my
taste the default no answer is better (I wanted to install the specified
targets, not a subset of them).

I had to change some pactest files as well, because now the default behavior
is not to remove unresolvable targets. In fact, the only pactest file that
tested this feature was ignore005.py.

Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Nagy Gabor 2009-07-27 14:21:26 +02:00 committed by Dan McGee
parent f53d9bab0e
commit 902dfe5900
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pactest/tests/ignore002.py
View File

@ -28,7 +28,7 @@ self.addpkg2db("sync", package4up)
self.option["IgnorePkg"] = ["package2"]
self.args = "-Su"
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_VERSION=package1|1.0-1")
self.addrule("PKG_VERSION=package2|1.0-1")
self.addrule("PKG_VERSION=package3|1.0-1")

2
pactest/tests/ignore003.py
View File

@ -28,7 +28,7 @@ self.addpkg2db("sync", package4up)
self.option["IgnorePkg"] = ["package2"]
self.args = "-Su"
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_VERSION=package1|1.0-1")
self.addrule("PKG_VERSION=package2|1.0-1")
self.addrule("PKG_VERSION=package3|1.0-1")

2
pactest/tests/ignore004.py
View File

@ -38,7 +38,7 @@ self.addpkg2db("sync", packageA5up)
self.option["IgnorePkg"] = ["packageA3"]
self.args = "-S packageA1"
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_VERSION=packageA1|1.0-1")
self.addrule("PKG_VERSION=packageA2|1.0-1")
self.addrule("PKG_VERSION=packageA3|1.0-1")

8
pactest/tests/ignore005.py
View File

@ -38,9 +38,9 @@ self.addpkg2db("sync", packageA5up)
self.option["IgnorePkg"] = ["packageA3"]
self.args = "-S packageA1 packageA2"
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_VERSION=packageA1|1.0-1")
self.addrule("PKG_VERSION=packageA2|2.0-1")
self.addrule("PKG_VERSION=packageA2|1.0-1")
self.addrule("PKG_VERSION=packageA3|1.0-1")
self.addrule("PKG_VERSION=packageA4|2.0-1")
self.addrule("PKG_VERSION=packageA5|2.0-1")
self.addrule("PKG_VERSION=packageA4|1.0-1")
self.addrule("PKG_VERSION=packageA5|1.0-1")

2
pactest/tests/provision020.py
View File

@ -10,6 +10,6 @@ self.addpkg2db("local", lp)
self.args = "-S %s" % p.name
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")
self.addrule("PKG_EXIST=pkg2")

2
pactest/tests/provision022.py
View File

@ -10,6 +10,6 @@ self.addpkg2db("local", lp)
self.args = "-S %s" % p.name
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")
self.addrule("PKG_EXIST=pkg2")

2
pactest/tests/sync1008.py
View File

@ -14,6 +14,6 @@ self.addpkg2db("sync1", sp3)
self.args = "-S pkg"
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg")
self.addrule("!PKG_EXIST=cpkg")

2
pactest/tests/sync300.py
View File

@ -9,6 +9,6 @@ self.addpkg2db("sync", sp2)
self.args = "-S %s" % sp1.name
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_RETCODE=1")
self.addrule("!PKG_EXIST=pkg1")
self.addrule("!PKG_EXIST=pkg2")

2
src/pacman/callback.c
View File

@ -275,7 +275,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
printf(_(":: the following package(s) cannot be upgraded due to "
"unresolvable dependencies:\n"));
list_display(" ", namelist);
*response = yesno(_("\nDo you want to skip the above "
*response = noyes(_("\nDo you want to skip the above "
"package(s) for this upgrade?"));
alpm_list_free(namelist);
}