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

alternatives: skip dup alternative groups.

Browse Source
This commit is contained in:
Juan RP 2015-10-31 11:47:58 +01:00
parent d68a2796c5
commit 59a8d3d20e
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/package_alternatives.c
View File

@ -303,7 +303,12 @@ xbps_alternatives_register(struct xbps_handle *xhp, xbps_dictionary_t pkgd)
if (array == NULL) {
alloc = true;
array = xbps_array_create();
} else {
/* already registered */
if (xbps_match_string_in_array(array, pkgname))
continue;
}
xbps_array_add_cstring(array, pkgname);
xbps_dictionary_set(alternatives, keyname, array);
xbps_set_cb_state(xhp, XBPS_STATE_ALTGROUP_ADDED, 0, NULL,

25
tests/xbps/xbps-alternatives/main.sh
View File

@ -28,6 +28,30 @@ register_one_body() {
atf_check_equal $rv 0
}
atf_test_case register_dups
register_dups_head() {
atf_set "descr" "xbps-alternatives: do not register dup alternative groups"
}
register_dups_body() {
mkdir -p repo pkg_A/usr/bin
touch pkg_A/usr/bin/fileA
cd repo
xbps-create -A noarch -n A-1.1_1 -s "A pkg" --alternatives "file:/usr/bin/file:/usr/bin/fileA" ../pkg_A
atf_check_equal $? 0
xbps-rindex -d -a $PWD/*.xbps
atf_check_equal $? 0
cd ..
xbps-install -r root --repository=repo -ydv A
atf_check_equal $? 0
xbps-install -r root --repository=repo -ydfv A
atf_check_equal $? 0
xbps-install -r root --repository=repo -ydfv A
atf_check_equal $? 0
atf_check_equal "$(xbps-alternatives -r root -l|wc -l)" 3
}
atf_test_case register_multi
register_multi_head() {
@ -262,6 +286,7 @@ set_pkg_group_body() {
atf_init_test_cases() {
atf_add_test_case register_one
atf_add_test_case register_dups
atf_add_test_case register_multi
atf_add_test_case unregister_one
atf_add_test_case unregister_multi