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

libxbps: make check_is_installed_pkg_* use only find_virtualpkg_dict_installed.

Browse Source 
xbps_find_virtualpkg_dict_installed() also finds real packages, so there's no
need to use both in xbps_check_is_installed_pkg_by_{name,pattern}.

Bump XBPS_API_VERSION.
This commit is contained in:
Juan RP
2011-10-30 16:24:56 +01:00
parent b09bd9740d
commit c5d6ccde46
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/util.c
View File

@ -65,8 +65,7 @@ xbps_check_is_installed_pkg_by_pattern(const char *pattern)
assert(pattern != NULL);
if ((dict = xbps_find_pkg_dict_installed(pattern, true)) == NULL)
dict = xbps_find_virtualpkg_dict_installed(pattern, true);
dict = xbps_find_virtualpkg_dict_installed(pattern, true);
if (dict == NULL) {
if (errno == ENOENT) {
errno = 0;
@ -98,10 +97,7 @@ xbps_check_is_installed_pkg_by_name(const char *pkgname)
assert(pkgname != NULL);
pkgd = xbps_find_pkg_dict_installed(pkgname, false);
if (pkgd == NULL)
pkgd = xbps_find_virtualpkg_dict_installed(pkgname, false);
pkgd = xbps_find_virtualpkg_dict_installed(pkgname, false);
if (pkgd) {
prop_object_release(pkgd);
return true;