moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

Fix previous.

Browse source 
--HG--
extra : convert_revision : a8073bfa4782f6c6a3e2afe760b184598f268807
This commit is contained in:
Juan RP 2009-02-14 03:57:29 +01:00
parent b55346ae64
commit 3084354cec
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bin/xbps-bin/main.c
View file

@ -138,24 +138,24 @@ main(int argc, char **argv)
if (strcasecmp(argv[0], "install") == 0) { if (strcasecmp(argv[0], "install") == 0) {
rv = xbps_install_binary_pkg(argv[1], root); rv = xbps_install_binary_pkg(argv[1], root);
if (rv) { if (rv) {
if (rv == ENOENT) if (errno == ENOENT)
printf("Unable to locate %s in " printf("Unable to locate %s in "
"repository pool.\n", argv[1]); "repository pool.\n", argv[1]);
else else
printf("Unable to install %s (%s).\n", printf("Unable to install %s (%s).\n",
argv[1], strerror(rv)); argv[1], strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
printf("Package %s installed successfully.\n", argv[1]); printf("Package %s installed successfully.\n", argv[1]);
} else { } else {
rv = xbps_remove_binary_pkg(argv[1], root); rv = xbps_remove_binary_pkg(argv[1], root);
if (rv) { if (rv) {
if (rv == ENOENT) if (errno == ENOENT)
printf("Package %s is not installed.\n", printf("Package %s is not installed.\n",
argv[1]); argv[1]);
else else
printf("Unable to remove %s (%s).\n", printf("Unable to remove %s (%s).\n",
argv[1], strerror(rv)); argv[1], strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
printf("Package %s removed successfully.\n", argv[1]); printf("Package %s removed successfully.\n", argv[1]);

8
lib/install.c
View file

@ -87,8 +87,6 @@ xbps_install_binary_pkg(const char *pkgname, const char *destdir)
*/ */
rv = xbps_callback_array_iter_in_repolist(install_binpkg_repo_cb, rv = xbps_callback_array_iter_in_repolist(install_binpkg_repo_cb,
(void *)&cb); (void *)&cb);
if (errno == ENOENT)
rv = ENOENT;
return rv; return rv;
} }
@ -139,8 +137,7 @@ install_binpkg_repo_cb(prop_object_t obj, void *arg, bool *cbloop_done)
/* /*
* Construct the dependency chain for this package. * Construct the dependency chain for this package.
*/ */
rv = xbps_find_deps_in_pkg(pkgrd); if ((rv = xbps_find_deps_in_pkg(pkgrd)) != 0) {
if (rv != 0) {
prop_object_release(repod); prop_object_release(repod);
if (rv == ENOENT) if (rv == ENOENT)
return 0; return 0;
@ -151,8 +148,7 @@ install_binpkg_repo_cb(prop_object_t obj, void *arg, bool *cbloop_done)
/* /*
* Install all required dependencies and the package itself. * Install all required dependencies and the package itself.
*/ */
rv = xbps_install_pkg_deps(pkgrd, destdir); if ((rv = xbps_install_pkg_deps(pkgrd, destdir)) == 0) {
if (rv == 0) {
rv = xbps_install_binary_pkg_fini(repod, pkgrd, destdir); rv = xbps_install_binary_pkg_fini(repod, pkgrd, destdir);
prop_object_release(repod); prop_object_release(repod);
if (rv == 0) if (rv == 0)