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

alternatives: fixed replace_alternative_with_symlink test case.

Browse Source 
Only 1 expected failure now!
This commit is contained in:
Juan RP
2020-02-07 09:43:47 +01:00
parent 94b56d7539
commit 732a0e6bdf
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/package_alternatives.c
View File

@@ -507,12 +507,10 @@ remove_obsoletes(struct xbps_handle *xhp, char *pkgname, const char *pkgver,
* Check if current provider in pkgdb is this pkg. * Check if current provider in pkgdb is this pkg.
*/ */
array2 = xbps_dictionary_get(pkgdb_alts, keyname); array2 = xbps_dictionary_get(pkgdb_alts, keyname);
if (array2 == NULL) { if (array2) {
remove_symlinks(xhp, array, keyname);
} else {
xbps_array_get_cstring_nocopy(array2, 0, &first); xbps_array_get_cstring_nocopy(array2, 0, &first);
if (strcmp(pkgname, first) == 0) { if (strcmp(pkgname, first) == 0) {
remove_symlinks(xhp, array, keyname); remove_symlinks(xhp, array_repo, keyname);
} }
} }
} }

2
tests/xbps/xbps-alternatives/main_test.sh
View File

@@ -772,8 +772,6 @@ replace_alternative_with_symlink_head() {
atf_set "descr" "xbps-alternatives: replace alternative group with a symlink" atf_set "descr" "xbps-alternatives: replace alternative group with a symlink"
} }
replace_alternative_with_symlink_body() { replace_alternative_with_symlink_body() {
atf_expect_fail "not fixed yet"
mkdir -p repo pkg_A/usr/bin mkdir -p repo pkg_A/usr/bin
touch pkg_A/usr/bin/fileA touch pkg_A/usr/bin/fileA
cd repo cd repo