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

Repair upgrades of preserve packages, i.e kernel.

Browse Source 
--HG--
extra : convert_revision : xtraeme%40gmail.com-20100125052754-6xri8lfmykhof5dz
This commit is contained in:
Juan RP
2010-01-25 06:27:54 +01:00
parent 7f343b8dbe
commit 17d87b3559
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -474,7 +474,8 @@ replace_packages(prop_object_iterator_t iter, const char *pkgver)
prop_object_release(instd);
version = xbps_get_pkg_version(pkgver);
if ((rv = xbps_remove_pkg(reppkgn, version, false)) != 0) {
rv = xbps_remove_pkg(reppkgn, version, false, false);
if (rv != 0) {
fprintf(stderr, "xbps-bin: couldn't remove %s (%s)\n",
reppkgn, strerror(rv));
return rv;
@@ -607,7 +608,7 @@ exec_transaction(struct transaction *trans)
printf("Removing %s-%s before installing new "
"version ...\n", pkgname, instver);
rv = xbps_remove_pkg(pkgname, version, true);
rv = xbps_remove_pkg(pkgname, version, true, essential);
if (rv != 0) {
fprintf(stderr, "xbps-bin: error "
"%s %s-%s (%s)\n", essential ?

5
bin/xbps-bin/remove.c
View File

@@ -105,7 +105,7 @@ xbps_autoremove_pkgs(bool force)
goto out;
}
printf("Removing package %s-%s ...\n", pkgname, version);
if ((rv = xbps_remove_pkg(pkgname, version, false)) != 0)
if ((rv = xbps_remove_pkg(pkgname, version, false, false)) != 0)
goto out2;
}
out2:
@@ -185,7 +185,8 @@ xbps_remove_installed_pkgs(int argc, char **argv, bool force)
continue;
prop_dictionary_get_cstring_nocopy(dict, "version", &version);
printf("Removing package %s-%s ...\n", argv[i], version);
if ((rv = xbps_remove_pkg(argv[i], version, false)) != 0) {
rv = xbps_remove_pkg(argv[i], version, false, false);
if (rv != 0) {
fprintf(stderr, "E: unable to remove %s-%s (%s).\n",
argv[i], version, strerror(errno));
return rv;