emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transaction_revdeps: do not skip pkgs that are being updated.

Browse Source 
Modified the test case with changes by @duncaen.

Closes #205
This commit is contained in:
Juan RP 2020-01-18 08:58:54 +01:00
parent 7ff9041f2a
commit 5ff3ab5c60
No known key found for this signature in database
GPG Key ID: AF19F6CB482F9368
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/transaction_revdeps.c
View File

@ -231,16 +231,6 @@ xbps_transaction_revdeps(struct xbps_handle *xhp, xbps_array_t pkgs)
free(pkgname); free(pkgname);
continue; continue;
} }
/*
* Installed package conflicts with package
* in transaction being updated, check
* if a new version of this conflicting package
* is in the transaction.
*/
if (xbps_find_pkg_in_array(pkgs, pkgname, "update")) {
free(pkgname);
continue;
}
free(pkgname); free(pkgname);
broken_pkg(mdeps, curpkgver, pkgver, tract); broken_pkg(mdeps, curpkgver, pkgver, tract);
} }

14
tests/xbps/libxbps/shell/install_test.sh
View File

@ -646,19 +646,6 @@ update_and_install_body() {
atf_check_equal $? 0 atf_check_equal $? 0
cd .. cd ..
# update pkgs: A and A-dbg
xbps-install -r root --repo=repo1 --repo=repo1-dbg -ydu
atf_check_equal $? 0
out=$(xbps-query -r root -l|wc -l)
atf_check_equal "$out" "2"
out=$(xbps-query -r root -p pkgver A)
atf_check_equal "$out" "A-1.0_2"
out=$(xbps-query -r root -p pkgver A-dbg)
atf_check_equal "$out" "A-dbg-1.0_2"
# Due to first repo wins, returns 19 because can't satisfy revdeps # Due to first repo wins, returns 19 because can't satisfy revdeps
xbps-install -r root --repo=repo2 --repo=repo1 --repo=repo1-dbg -ydun A xbps-install -r root --repo=repo2 --repo=repo1 --repo=repo1-dbg -ydun A
atf_check_equal $? 19 atf_check_equal $? 19
@ -676,6 +663,7 @@ update_and_install_body() {
out=$(xbps-query -r root -p pkgver A-dbg) out=$(xbps-query -r root -p pkgver A-dbg)
atf_check_equal "$out" "A-dbg-1.0_2" atf_check_equal "$out" "A-dbg-1.0_2"
# check again with A-2.0_1 in first repo.
xbps-install -r root --repo=repo2 --repo=repo1 --repo=repo1-dbg -ydun A xbps-install -r root --repo=repo2 --repo=repo1 --repo=repo1-dbg -ydun A
atf_check_equal $? 19 atf_check_equal $? 19
} }