moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Fix for removing a package that is no longer needed

Browse Source 
Fix for remove041 pactest. You could not remove a package before that
was provided by something else already installed on the system. This fixes
this problem.

Reference:
http://archlinux.org/pipermail/pacman-dev/2007-April/008131.html
http://archlinux.org/pipermail/pacman-dev/2007-April/008134.html

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Chantry Xavier 2007-06-10 04:00:50 +02:00 committed by Dan McGee
parent 1da78a7d25
commit 796cc4e6ed
1 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lib/libalpm/deps.c
View File

@ -349,44 +349,48 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
} else if(op == PM_TRANS_TYPE_REMOVE) { } else if(op == PM_TRANS_TYPE_REMOVE) {
/* check requiredby fields */ /* check requiredby fields */
for(i = packages; i; i = i->next) { for(i = packages; i; i = i->next) {
pmpkg_t *tp = i->data; pmpkg_t *rmpkg = alpm_list_getdata(i);
if(tp == NULL) {
if(rmpkg == NULL) {
_alpm_log(PM_LOG_DEBUG, _("null package found in package list"));
continue;
}
for(j = alpm_pkg_get_requiredby(rmpkg); j; j = j->next) {
pmpkg_t *p;
found = 0;
if(_alpm_pkg_find(j->data, packages)) {
/* package also in the remove list, so don't worry about it */
continue; continue;
} }
found=0; if((p = _alpm_db_get_pkgfromcache(db, j->data)) == NULL) {
for(j = alpm_pkg_get_requiredby(tp); j; j = j->next) { /* hmmm... package isn't installed... */
/* Search for 'reqname' in packages for removal */ continue;
char *reqname = j->data; }
alpm_list_t *x = NULL; for(k = alpm_pkg_get_depends(p); k; k = k->next) {
for(x = packages; x; x = x->next) { pmdepend_t *depend = alpm_splitdep(k->data);
pmpkg_t *xp = x->data; if(depend == NULL) {
if(strcmp(reqname, alpm_pkg_get_name(xp)) == 0) { continue;
found = 1; }
/* if rmpkg satisfied this dep, try to find an other satisfier
* (which won't be removed)*/
if(alpm_depcmp(rmpkg, depend)) {
int satisfied = 0;
for(l = _alpm_db_get_pkgcache(db); l; l = l->next) {
pmpkg_t *pkg = l->data;
if(alpm_depcmp(pkg, depend) && !_alpm_pkg_find(alpm_pkg_get_name(pkg), packages)) {
_alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' satisfied by installed package '%s'"),
depend->name, alpm_pkg_get_name(pkg));
satisfied = 1;
break; break;
} }
} }
if(!found) {
/* check if a package in trans->packages provides this package */ if(!satisfied) {
for(k = trans->packages; !found && k; k=k->next) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s which requires %s"),
pmpkg_t *spkg = NULL; alpm_pkg_get_name(p), alpm_pkg_get_name(rmpkg));
if(trans->type == PM_TRANS_TYPE_SYNC) { miss = _alpm_depmiss_new(alpm_pkg_get_name(rmpkg), PM_DEP_TYPE_DEPEND,
pmsyncpkg_t *sync = k->data; PM_DEP_MOD_ANY, alpm_pkg_get_name(p), NULL);
spkg = sync->pkg;
} else {
spkg = k->data;
}
if(spkg) {
if(alpm_list_find_str(alpm_pkg_get_provides(spkg), tp->name)) {
found = 1;
}
}
}
if(!found) {
_alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"),
reqname, alpm_pkg_get_name(tp));
miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND,
PM_DEP_MOD_ANY, j->data, NULL);
if(!_alpm_depmiss_isin(miss, baddeps)) { if(!_alpm_depmiss_isin(miss, baddeps)) {
baddeps = alpm_list_add(baddeps, miss); baddeps = alpm_list_add(baddeps, miss);
} else { } else {
@ -394,6 +398,8 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
} }
} }
} }
free(depend);
}
} }
} }
} }