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

Maintain a list of seen packages when installing a group

Browse Source 
As reported in FS#20221, we don't always do the right thing when installing
a group and using the --needed option. This was due to the code pulling
packages based on what was already in the transaction's add list, but
completely ignoring the fact that we may have already seen and skipped this
same package in an earlier repository.

Add a list to the private _alpm_sync_pkg() function that allows us to have
this extra information so we don't mistakenly downgrade a package when using
--needed.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2010-07-25 22:31:55 -05:00
parent e702f56ea6
commit f8d7cd6b26
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libalpm/sync.c
View File

@ -202,7 +202,7 @@ int SYMEXPORT alpm_sync_sysupgrade(int enable_downgrade)
return(0); return(0);
} }
int _alpm_sync_pkg(pmpkg_t *spkg) int _alpm_sync_pkg(pmpkg_t *spkg, alpm_list_t *pkg_list)
{ {
pmtrans_t *trans; pmtrans_t *trans;
pmdb_t *db_local; pmdb_t *db_local;
@ -213,7 +213,7 @@ int _alpm_sync_pkg(pmpkg_t *spkg)
trans = handle->trans; trans = handle->trans;
db_local = handle->db_local; db_local = handle->db_local;
if(_alpm_pkg_find(trans->add, alpm_pkg_get_name(spkg))) { if(_alpm_pkg_find(pkg_list, alpm_pkg_get_name(spkg))) {
RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
} }
@ -251,6 +251,7 @@ int _alpm_sync_pkg(pmpkg_t *spkg)
int _alpm_sync_target(alpm_list_t *dbs_sync, char *target) int _alpm_sync_target(alpm_list_t *dbs_sync, char *target)
{ {
alpm_list_t *i, *j; alpm_list_t *i, *j;
alpm_list_t *known_pkgs = NULL;
pmpkg_t *spkg; pmpkg_t *spkg;
pmdepend_t *dep; /* provisions and dependencies are also allowed */ pmdepend_t *dep; /* provisions and dependencies are also allowed */
pmgrp_t *grp; pmgrp_t *grp;
@ -267,7 +268,7 @@ int _alpm_sync_target(alpm_list_t *dbs_sync, char *target)
_alpm_dep_free(dep); _alpm_dep_free(dep);
if(spkg != NULL) { if(spkg != NULL) {
return(_alpm_sync_pkg(spkg)); return(_alpm_sync_pkg(spkg, handle->trans->add));
} }
_alpm_log(PM_LOG_DEBUG, "%s package not found, searching for group...\n", target); _alpm_log(PM_LOG_DEBUG, "%s package not found, searching for group...\n", target);
@ -278,17 +279,20 @@ int _alpm_sync_target(alpm_list_t *dbs_sync, char *target)
found = 1; found = 1;
for(j = alpm_grp_get_pkgs(grp); j; j = j->next) { for(j = alpm_grp_get_pkgs(grp); j; j = j->next) {
pmpkg_t *pkg = j->data; pmpkg_t *pkg = j->data;
if(_alpm_sync_pkg(pkg) == -1) { if(_alpm_sync_pkg(pkg, known_pkgs) == -1) {
if(pm_errno == PM_ERR_TRANS_DUP_TARGET || pm_errno == PM_ERR_PKG_IGNORED) { if(pm_errno == PM_ERR_TRANS_DUP_TARGET || pm_errno == PM_ERR_PKG_IGNORED) {
/* just skip duplicate or ignored targets */ /* just skip duplicate or ignored targets */
continue; continue;
} else { } else {
alpm_list_free(known_pkgs);
return(-1); return(-1);
} }
} }
known_pkgs = alpm_list_add(known_pkgs, pkg);
} }
} }
} }
alpm_list_free(known_pkgs);
if(!found) { if(!found) {
/* pass through any 'found but ignored' errors */ /* pass through any 'found but ignored' errors */

2
test/pacman/tests/sync023.py
View File

@ -27,5 +27,3 @@ for p in sp1, sp2, sp3:
self.addrule("PKG_EXIST=%s" % p.name) self.addrule("PKG_EXIST=%s" % p.name)
# The newer version should still be installed # The newer version should still be installed
self.addrule("PKG_VERSION=pkg1|1.1-1") self.addrule("PKG_VERSION=pkg1|1.1-1")
self.expectfailure = True