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

16
lib/remove.c
View File

@ -174,13 +174,14 @@ xbps_remove_pkg_files(prop_dictionary_t dict, const char *key)
}
int
xbps_remove_pkg(const char *pkgname, const char *version, bool update)
xbps_remove_pkg(const char *pkgname, const char *version,
bool update, bool essential)
{
prop_dictionary_t dict, pkgd;
prop_dictionary_t dict;
const char *rootdir = xbps_get_rootdir();
char *path, *buf;
int rv = 0;
bool essential = false, prepostf = false;
bool prepostf = false;
assert(pkgname != NULL);
assert(version != NULL);
@ -188,12 +189,9 @@ xbps_remove_pkg(const char *pkgname, const char *version, bool update)
/*
* Check if pkg is installed before anything else.
*/
if ((pkgd = xbps_find_pkg_dict_installed(pkgname, false)) == NULL)
if (!xbps_check_is_installed_pkgname(pkgname))
return ENOENT;
prop_dictionary_get_bool(pkgd, "essential", &essential);
prop_object_release(pkgd);
if (strcmp(rootdir, "") == 0)
rootdir = "/";
@ -230,8 +228,10 @@ xbps_remove_pkg(const char *pkgname, const char *version, bool update)
* entries and continue. Its files will be overwritten later in
* the unpack phase.
*/
if (essential && update)
if (essential && update) {
free(buf);
return xbps_requiredby_pkg_remove(pkgname);
}
/*
* Remove links, files and dirs.