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

xbps-bin: multiple fixes to update packages.

Browse Source 
* Fix 'autoupdate' target to look for new packages in ALL repos, not
  just the first one that has the package.
* Fix 'update' target to work correctly.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091016133157-asvkv5jb6i9q2ibe
This commit is contained in:
Juan RP
2009-10-16 15:31:57 +02:00
parent d771383442
commit e1f2a8b7bd
3 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bin/xbps-bin/install.c
View File

@ -220,10 +220,19 @@ xbps_install_pkg(const char *pkg, bool force, bool update)
pkgd = xbps_find_pkg_installed_from_plist(pkg);
if (update) {
if (pkgd) {
if ((rv = xbps_find_new_pkg(pkg, pkgd)) == 0) {
rv = xbps_find_new_pkg(pkg, pkgd);
if (rv == EEXIST) {
printf("Package '%s' is up to date.\n", pkg);
prop_object_release(pkgd);
cleanup(rv);
} else if (rv == ENOENT) {
printf("Package '%s' not found in "
"repository pool.\n", pkg);
prop_object_release(pkgd);
cleanup(rv);
} else if (rv != 0) {
prop_object_release(pkgd);
cleanup(rv);
}
prop_object_release(pkgd);
} else {
@ -238,7 +247,8 @@ xbps_install_pkg(const char *pkg, bool force, bool update)
}
rv = xbps_prepare_pkg(pkg);
if (rv != 0 && rv == EAGAIN) {
printf("Unable to locate '%s' in repository pool.\n", pkg);
printf("Unable to locate '%s' in repository pool.\n",
pkg);
cleanup(rv);
} else if (rv != 0 && rv != ENOENT) {
printf("Unexpected error: %s", strerror(rv));
@ -268,12 +278,21 @@ xbps_install_pkg(const char *pkg, bool force, bool update)
prop_dictionary_get_cstring_nocopy(trans->dict,
"origin", &trans->originpkgname);
/*
* Sort the package transaction dictionary.
*/
if ((rv = xbps_sort_pkg_deps(trans->dict)) != 0) {
printf("Error while sorting packages: %s\n",
strerror(rv));
goto out2;
}
/*
* It's time to run the transaction!
*/
trans->iter = xbps_get_array_iter_from_dict(trans->dict, "packages");
if (trans->iter == NULL) {
printf("error: allocating array mem! (%s)",
printf("error: allocating array mem! (%s)\n",
strerror(errno));
goto out2;
}