moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

Print replacements when using -Sup

Browse Source 
When printing a list of URLs of packages to be updated, pacman was ignoring any
replacements that would be made in the update process.

Fixes FS#35812

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2016-03-29 16:36:59 +10:00
parent 4960be7764
commit 3ed57be450
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pacman/callback.c
View File

@ -375,10 +375,14 @@ void cb_event(alpm_event_t *event)
void cb_question(alpm_question_t *question)
{
if(config->print) {
if(question->type == ALPM_QUESTION_INSTALL_IGNOREPKG) {
question->any.answer = 1;
} else {
question->any.answer = 0;
switch(question->type) {
case ALPM_QUESTION_INSTALL_IGNOREPKG:
case ALPM_QUESTION_REPLACE_PKG:
question->any.answer = 1;
break;
default:
question->any.answer = 0;
break;
}
return;
}

1
test/pacman/tests/TESTS
View File

@ -161,6 +161,7 @@ TESTS += test/pacman/tests/sync-nodepversion03.py
TESTS += test/pacman/tests/sync-nodepversion04.py
TESTS += test/pacman/tests/sync-nodepversion05.py
TESTS += test/pacman/tests/sync-nodepversion06.py
TESTS += test/pacman/tests/sync-sysupgrade-print-replaced-packages.py
TESTS += test/pacman/tests/sync-update-assumeinstalled.py
TESTS += test/pacman/tests/sync-update-package-removing-required-provides.py
TESTS += test/pacman/tests/sync001.py

14
test/pacman/tests/sync-sysupgrade-print-replaced-packages.py Normal file
View File

@ -0,0 +1,14 @@
self.description = "Print replacements when using -Sup"
lp = pmpkg("a", "1-1")
self.addpkg2db("local", lp)
sp = pmpkg("b", "2-2")
sp.replaces = ["a"]
self.addpkg2db("sync", sp)
self.args = "-Sup"
self.addrule("PACMAN_RETCODE=0")
self.addrule("PACMAN_OUTPUT=%s-%s" % (sp.name, sp.version))