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

fix setting alternatives for packages with more than one group

Browse Source
This commit is contained in:
human 2019-01-16 19:48:00 +02:00 committed by Duncaen
parent bd616aa901
commit b502dc708a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/package_alternatives.c
View File

@ -249,6 +249,9 @@ xbps_alternatives_set(struct xbps_handle *xhp, const char *pkgname,
if (!xbps_dictionary_count(pkg_alternatives)) if (!xbps_dictionary_count(pkg_alternatives))
return ENOENT; return ENOENT;
if (group && !xbps_dictionary_get(pkg_alternatives, group))
return ENOENT;
xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver); xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver);
allkeys = xbps_dictionary_all_keys(pkg_alternatives); allkeys = xbps_dictionary_all_keys(pkg_alternatives);
@ -261,10 +264,8 @@ xbps_alternatives_set(struct xbps_handle *xhp, const char *pkgname,
keysym = xbps_array_get(allkeys, i); keysym = xbps_array_get(allkeys, i);
keyname = xbps_dictionary_keysym_cstring_nocopy(keysym); keyname = xbps_dictionary_keysym_cstring_nocopy(keysym);
if (group && strcmp(keyname, group)) { if (group && strcmp(keyname, group))
rv = ENOENT;
continue; continue;
}
array = xbps_dictionary_get(alternatives, keyname); array = xbps_dictionary_get(alternatives, keyname);
if (array == NULL) if (array == NULL)
@ -294,7 +295,7 @@ xbps_alternatives_set(struct xbps_handle *xhp, const char *pkgname,
xbps_set_cb_state(xhp, XBPS_STATE_ALTGROUP_ADDED, 0, NULL, xbps_set_cb_state(xhp, XBPS_STATE_ALTGROUP_ADDED, 0, NULL,
"%s: applying '%s' alternatives group", pkgver, keyname); "%s: applying '%s' alternatives group", pkgver, keyname);
rv = create_symlinks(xhp, xbps_dictionary_get(pkg_alternatives, keyname), keyname); rv = create_symlinks(xhp, xbps_dictionary_get(pkg_alternatives, keyname), keyname);
if (rv != 0) if (rv != 0 || group)
break; break;
} }
xbps_object_release(allkeys); xbps_object_release(allkeys);