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

libxbps: ignore indirect broken revdeps while updating xbps.

Browse Source 
This fixes the long standing issue that has been a plague for
a long time.

See the test case for more information.
This commit is contained in:
Juan RP 2020-01-04 13:01:28 +01:00
parent d68ff7ebf0
commit 10075c28e5
No known key found for this signature in database
GPG Key ID: AF19F6CB482F9368
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/transaction_ops.c
View File

@ -271,6 +271,17 @@ xbps_autoupdate(struct xbps_handle *xhp)
if (rv && rv != ENOENT && rv != EEXIST && rv != ENODEV)
return -1;
}
/*
* Set XBPS_FLAG_FORCE_REMOVE_REVDEPS to ignore broken
* reverse dependencies in xbps_transaction_prepare().
*
* This won't skip revdeps of the xbps pkg, rather other
* packages in rootdir that could be broken indirectly.
*
* A sysup transaction after updating xbps should fix them
* again.
*/
xhp->flags |= XBPS_FLAG_FORCE_REMOVE_REVDEPS;
return 1;
} else if (rv == ENOENT || rv == EEXIST || rv == ENODEV) {
/* no update */

53
tests/xbps/libxbps/shell/update_itself_test.sh
View File

@ -165,10 +165,61 @@ update_xbps_with_uptodate_revdeps_body() {
atf_check_equal $out base-system-1.0_1
}
atf_test_case update_xbps_on_any_op
atf_test_case update_xbps_with_indirect_revdeps
update_xbps_with_indirect_revdeps_head() {
atf_set "descr" "Tests for pkg updates: xbps updates itself with indirect revdeps"
}
update_xbps_with_indirect_revdeps_body() {
mkdir -p repo pkg
cd repo
xbps-create -A noarch -n xbps-1.0_1 -s "xbps pkg" --dependencies "libcrypto>=0 cacerts>=0" ../pkg
atf_check_equal $? 0
xbps-create -A noarch -n libcrypto-1.0_1 -s "libcrypto pkg" ../pkg
atf_check_equal $? 0
xbps-create -A noarch -n libressl-1.0_1 -s "libressl pkg" --dependencies "libcrypto-1.0_1" ../pkg
atf_check_equal $? 0
xbps-create -A noarch -n cacerts-1.0_1 -s "cacerts pkg" --dependencies "libressl-1.0_1" ../pkg
atf_check_equal $? 0
xbps-rindex -d -a $PWD/*.xbps
atf_check_equal $? 0
cd ..
xbps-install -r root --repository=$PWD/repo -yd xbps-1.0_1
atf_check_equal $? 0
cd repo
xbps-create -A noarch -n xbps-1.1_1 -s "xbps pkg" --dependencies "libcrypto>=1.1" ../pkg
atf_check_equal $? 0
xbps-create -A noarch -n libcrypto-1.1_1 -s "libcrypto pkg" ../pkg
atf_check_equal $? 0
xbps-create -A noarch -n libressl-1.1_1 -s "libressl pkg" --dependencies "libcrypto-1.1_1" ../pkg
atf_check_equal $? 0
xbps-rindex -d -a $PWD/*.xbps
atf_check_equal $? 0
cd ..
xbps-install -r root --repository=$PWD/repo -yu xbps
atf_check_equal $? 0
out=$(xbps-query -r root -p pkgver xbps)
atf_check_equal "$out" "xbps-1.1_1"
out=$(xbps-query -r root -p pkgver libcrypto)
atf_check_equal "$out" "libcrypto-1.1_1"
out=$(xbps-query -r root -p pkgver libressl)
atf_check_equal "$out" "libressl-1.0_1"
out=$(xbps-query -r root -p pkgver cacerts)
atf_check_equal "$out" "cacerts-1.0_1"
}
atf_init_test_cases() {
atf_add_test_case update_xbps
atf_add_test_case update_xbps_with_revdeps
atf_add_test_case update_xbps_with_indirect_revdeps
atf_add_test_case update_xbps_with_uptodate_revdeps
}