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

libxbps: remove old code and return early if pkg has no rundeps.

Browse Source
This commit is contained in:
Juan RP 2012-11-15 01:37:09 +01:00
parent ce3d4f1764
commit 5c0abc9754
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/repository_finddeps.c
View File

@ -368,18 +368,15 @@ find_repo_deps(struct xbps_handle *xhp,
if (rv != 0) { if (rv != 0) {
xbps_dbg_printf(xhp, "store_dependency failed for " xbps_dbg_printf(xhp, "store_dependency failed for "
"`%s': %s\n", reqpkg, strerror(rv)); "`%s': %s\n", reqpkg, strerror(rv));
prop_object_release(curpkgd);
break; break;
} }
/* /*
* If package doesn't have rundeps, pass to the next one. * If package doesn't have rundeps, pass to the next one.
*/ */
curpkgrdeps = prop_dictionary_get(curpkgd, "run_depends"); curpkgrdeps = prop_dictionary_get(curpkgd, "run_depends");
if (curpkgrdeps == NULL) { if (curpkgrdeps == NULL)
prop_object_release(curpkgd);
continue; continue;
}
prop_object_release(curpkgd);
if (xhp->flags & XBPS_FLAG_DEBUG) { if (xhp->flags & XBPS_FLAG_DEBUG) {
xbps_dbg_printf(xhp, ""); xbps_dbg_printf(xhp, "");
for (x = 0; x < *depth; x++) for (x = 0; x < *depth; x++)
@ -415,6 +412,8 @@ xbps_repository_find_pkg_deps(struct xbps_handle *xhp,
pkg_rdeps = prop_dictionary_get(repo_pkgd, "run_depends"); pkg_rdeps = prop_dictionary_get(repo_pkgd, "run_depends");
if (prop_object_type(pkg_rdeps) != PROP_TYPE_ARRAY) if (prop_object_type(pkg_rdeps) != PROP_TYPE_ARRAY)
return 0; return 0;
else if (prop_array_count(pkg_rdeps) == 0)
return 0;
prop_dictionary_get_cstring_nocopy(repo_pkgd, "pkgver", &pkgver); prop_dictionary_get_cstring_nocopy(repo_pkgd, "pkgver", &pkgver);
xbps_dbg_printf(xhp, "Finding required dependencies for '%s':\n", pkgver); xbps_dbg_printf(xhp, "Finding required dependencies for '%s':\n", pkgver);