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

* Maybe that call to _alpm_trans_update_depends was necessary. Added it back

Browse Source 
in but did it right by duplicating the package first.
This commit is contained in:
Dan McGee 2007-03-04 01:22:57 +00:00
parent eb8ae6cdc8
commit 8178c2f986
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libalpm/remove.c
View File

@ -264,7 +264,7 @@ static void unlink_file(pmpkg_t *info, alpm_list_t *lp, alpm_list_t *targ,
int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
{ {
pmpkg_t *info; pmpkg_t *info, *infodup;
alpm_list_t *targ, *lp; alpm_list_t *targ, *lp;
ALPM_LOG_FUNC; ALPM_LOG_FUNC;
@ -330,6 +330,9 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
} }
} }
/* duplicate the package so we can remove the requiredby fields later */
infodup = _alpm_pkg_dup(info);
/* remove the package from the database */ /* remove the package from the database */
_alpm_log(PM_LOG_DEBUG, _("updating database")); _alpm_log(PM_LOG_DEBUG, _("updating database"));
_alpm_log(PM_LOG_DEBUG, _("removing database entry '%s'"), pkgname); _alpm_log(PM_LOG_DEBUG, _("removing database entry '%s'"), pkgname);
@ -343,6 +346,11 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
pkgname); pkgname);
} }
/* update dependency packages' REQUIREDBY fields */
_alpm_trans_update_depends(trans, infodup);
_alpm_pkg_free(infodup);
PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkgname, 100, PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkgname, 100,
alpm_list_count(trans->packages), alpm_list_count(trans->packages),
(alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); (alpm_list_count(trans->packages) - alpm_list_count(targ) +1));

2
lib/libalpm/sync.c
View File

@ -1065,7 +1065,7 @@ pmsyncpkg_t *_alpm_sync_find(alpm_list_t *syncpkgs, const char* pkgname)
} }
} }
_alpm_log(PM_LOG_DEBUG, _("package '%s not found in sync"), pkgname); _alpm_log(PM_LOG_DEBUG, _("package '%s' not found in sync"), pkgname);
return(NULL); /* not found */ return(NULL); /* not found */
} }