moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-09 04:57:59 -05:00
Code Issues Releases Wiki Activity

* Bug fix FS#6058

Browse Source 
properly remove entries from "Required By" instead of wiping it out entirely
This commit is contained in:
Aaron Griffin 2007-01-03 06:13:08 +00:00
parent 65e086e0e3
commit 50030f778a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libalpm/add.c
View File

@ -782,6 +782,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
_alpm_log(PM_LOG_ERROR, _("could not add entry '%s' in cache"), info->name); _alpm_log(PM_LOG_ERROR, _("could not add entry '%s' in cache"), info->name);
} }
/* XXX: This is copy-pasta from remove.c - refactor */
/* update dependency packages' REQUIREDBY fields */ /* update dependency packages' REQUIREDBY fields */
if(info->depends) { if(info->depends) {
_alpm_log(PM_LOG_FLOW2, _("updating dependency packages 'requiredby' fields")); _alpm_log(PM_LOG_FLOW2, _("updating dependency packages 'requiredby' fields"));
@ -810,6 +811,10 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
continue; continue;
} }
} }
/* Ensure package has the right info */
_alpm_db_read(db, INFRQ_DEPENDS, depinfo);
_alpm_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), info->name, depinfo->name); _alpm_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), info->name, depinfo->name);
depinfo->requiredby = _alpm_list_add(depinfo->requiredby, strdup(info->name)); depinfo->requiredby = _alpm_list_add(depinfo->requiredby, strdup(info->name));
if(_alpm_db_write(db, depinfo, INFRQ_DEPENDS)) { if(_alpm_db_write(db, depinfo, INFRQ_DEPENDS)) {

2
lib/libalpm/remove.c
View File

@ -325,6 +325,8 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
continue; continue;
} }
} }
/* Ensure package has the appropriate data */
_alpm_db_read(db, INFRQ_DEPENDS, depinfo);
/* splice out this entry from requiredby */ /* splice out this entry from requiredby */
depinfo->requiredby = _alpm_list_remove(depinfo->requiredby, info->name, str_cmp, &vdata); depinfo->requiredby = _alpm_list_remove(depinfo->requiredby, info->name, str_cmp, &vdata);
data = vdata; data = vdata;