Simplify xbps_install_binary_pkg_from_repolist().

--HG--
extra : convert_revision : 9d4960502c05130a97459e41f66b4b19ec0acbc2
This commit is contained in:
Juan RP 2009-02-05 17:38:31 +01:00
parent 5ab39d53f5
commit 894cb13b59

View file

@ -79,17 +79,7 @@ xbps_install_binary_pkg_from_repolist(prop_object_t obj, void *arg,
*/ */
if (!xbps_pkg_has_rundeps(pkgrd)) { if (!xbps_pkg_has_rundeps(pkgrd)) {
/* pkg has no deps, just install it. */ /* pkg has no deps, just install it. */
rv = xbps_unpack_binary_pkg(repod, pkgrd, goto install;
xbps_unpack_archive_cb);
if (rv == 0) {
rv = xbps_register_pkg(pkgname, version, desc);
if (rv == EEXIST)
rv = 0;
}
free(plist);
prop_object_release(repod);
*loop_done = true;
return rv;
} }
/* /*
@ -101,6 +91,8 @@ xbps_install_binary_pkg_from_repolist(prop_object_t obj, void *arg,
prop_object_release(repod); prop_object_release(repod);
return rv; return rv;
} }
install:
/* /*
* Finally install the package, now that all * Finally install the package, now that all
* required dependencies were installed. * required dependencies were installed.