bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'sync-update-remove' into 'master'

Browse source 
Fix sync-update-remove problem by double checking

See merge request pacman/pacman!157
This commit is contained in:
Dale Young 2025-06-22 08:57:07 +00:00
commit 58cddafc78
4 changed files with 71 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
lib/libalpm/sync.c
View file

@ -364,21 +364,19 @@ finish:
return ret; return ret;
} }
int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) static int _alpm_sync_prepare_pkgs(alpm_handle_t *handle, alpm_list_t **data,
alpm_list_t *extrapkgs, alpm_list_t **resolved)
{ {
alpm_list_t *i, *j; alpm_list_t *i, *j;
alpm_list_t *deps = NULL; alpm_list_t *deps = NULL;
alpm_list_t *unresolvable = NULL; alpm_list_t *unresolvable = NULL;
int from_sync = 0;
int ret = 0;
alpm_trans_t *trans = handle->trans; alpm_trans_t *trans = handle->trans;
alpm_event_t event; alpm_event_t event;
alpm_list_t *pkglist = (extrapkgs ? extrapkgs : trans->add);
int from_sync = 0;
int ret = 0;
if(data) { for(i = pkglist; i; i = i->next) {
*data = NULL;
}
for(i = trans->add; i; i = i->next) {
alpm_pkg_t *spkg = i->data; alpm_pkg_t *spkg = i->data;
if (spkg->origin == ALPM_PKG_FROM_SYNCDB){ if (spkg->origin == ALPM_PKG_FROM_SYNCDB){
from_sync = 1; from_sync = 1;
@ -399,7 +397,6 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
} }
if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) {
alpm_list_t *resolved = NULL;
alpm_list_t *remove = alpm_list_copy(trans->remove); alpm_list_t *remove = alpm_list_copy(trans->remove);
alpm_list_t *localpkgs; alpm_list_t *localpkgs;
@ -410,7 +407,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
_alpm_log(handle, ALPM_LOG_DEBUG, "resolving target's dependencies\n"); _alpm_log(handle, ALPM_LOG_DEBUG, "resolving target's dependencies\n");
/* build remove list for resolvedeps */ /* build remove list for resolvedeps */
for(i = trans->add; i; i = i->next) { for(i = pkglist; i; i = i->next) {
alpm_pkg_t *spkg = i->data; alpm_pkg_t *spkg = i->data;
for(j = spkg->removes; j; j = j->next) { for(j = spkg->removes; j; j = j->next) {
remove = alpm_list_add(remove, j->data); remove = alpm_list_add(remove, j->data);
@ -420,14 +417,14 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
/* Compute the fake local database for resolvedeps (partial fix for the /* Compute the fake local database for resolvedeps (partial fix for the
* phonon/qt issue) */ * phonon/qt issue) */
localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(handle->db_local), localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(handle->db_local),
trans->add, _alpm_pkg_cmp); pkglist, _alpm_pkg_cmp);
/* Resolve packages in the transaction one at a time, in addition /* Resolve packages in the transaction one at a time, in addition
building up a list of packages which could not be resolved. */ building up a list of packages which could not be resolved. */
for(i = trans->add; i; i = i->next) { for(i = pkglist; i; i = i->next) {
alpm_pkg_t *pkg = i->data; alpm_pkg_t *pkg = i->data;
if(_alpm_resolvedeps(handle, localpkgs, pkg, trans->add, if(_alpm_resolvedeps(handle, localpkgs, pkg, pkglist,
&resolved, remove, data) == -1) { resolved, remove, data) == -1) {
unresolvable = alpm_list_add(unresolvable, pkg); unresolvable = alpm_list_add(unresolvable, pkg);
} }
/* Else, [resolved] now additionally contains [pkg] and all of its /* Else, [resolved] now additionally contains [pkg] and all of its
@ -459,15 +456,15 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
} }
} else { } else {
/* pm_errno was set by resolvedeps, callback may have overwrote it */ /* pm_errno was set by resolvedeps, callback may have overwrote it */
alpm_list_free(resolved); alpm_list_free(*resolved);
alpm_list_free(unresolvable); alpm_list_free(unresolvable);
ret = -1; ret = -1;
GOTO_ERR(handle, ALPM_ERR_UNSATISFIED_DEPS, cleanup); GOTO_ERR(handle, ALPM_ERR_UNSATISFIED_DEPS, _cleanup);
} }
} }
/* Ensure two packages don't have the same filename */ /* Ensure two packages don't have the same filename */
for(i = resolved; i; i = i->next) { for(i = *resolved; i; i = i->next) {
alpm_pkg_t *pkg1 = i->data; alpm_pkg_t *pkg1 = i->data;
for(j = i->next; j; j = j->next) { for(j = i->next; j; j = j->next) {
alpm_pkg_t *pkg2 = j->data; alpm_pkg_t *pkg2 = j->data;
@ -481,12 +478,12 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
} }
if(ret != 0) { if(ret != 0) {
alpm_list_free(resolved); alpm_list_free(*resolved);
goto cleanup; goto _cleanup;
} }
/* Set DEPEND reason for pulled packages */ /* Set DEPEND reason for pulled packages */
for(i = resolved; i; i = i->next) { for(i = *resolved; i; i = i->next) {
alpm_pkg_t *pkg = i->data; alpm_pkg_t *pkg = i->data;
if(!alpm_pkg_find(trans->add, pkg->name)) { if(!alpm_pkg_find(trans->add, pkg->name)) {
pkg->reason = ALPM_PKG_REASON_DEPEND; pkg->reason = ALPM_PKG_REASON_DEPEND;
@ -499,8 +496,9 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
* holds to package objects. */ * holds to package objects. */
trans->unresolvable = unresolvable; trans->unresolvable = unresolvable;
alpm_list_free(trans->add); // alpm_list_free(trans->add);
trans->add = resolved; trans->add = *resolved;
pkglist = (extrapkgs ? pkglist : *resolved);
event.type = ALPM_EVENT_RESOLVEDEPS_DONE; event.type = ALPM_EVENT_RESOLVEDEPS_DONE;
EVENT(handle, &event); EVENT(handle, &event);
@ -556,7 +554,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
alpm_list_free(deps); alpm_list_free(deps);
alpm_dep_free(dep1); alpm_dep_free(dep1);
alpm_dep_free(dep2); alpm_dep_free(dep2);
goto cleanup; goto _cleanup;
} }
alpm_dep_free(dep1); alpm_dep_free(dep1);
alpm_dep_free(dep2); alpm_dep_free(dep2);
@ -626,7 +624,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
} }
alpm_list_free_inner(deps, (alpm_list_fn_free)alpm_conflict_free); alpm_list_free_inner(deps, (alpm_list_fn_free)alpm_conflict_free);
alpm_list_free(deps); alpm_list_free(deps);
goto cleanup; goto _cleanup;
} }
} }
event.type = ALPM_EVENT_INTERCONFLICTS_DONE; event.type = ALPM_EVENT_INTERCONFLICTS_DONE;
@ -636,7 +634,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
} }
/* Build trans->remove list */ /* Build trans->remove list */
for(i = trans->add; i; i = i->next) { for(i = pkglist; i; i = i->next) {
alpm_pkg_t *spkg = i->data; alpm_pkg_t *spkg = i->data;
for(j = spkg->removes; j; j = j->next) { for(j = spkg->removes; j; j = j->next) {
alpm_pkg_t *rpkg = j->data; alpm_pkg_t *rpkg = j->data;
@ -651,11 +649,49 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
} }
} }
_cleanup:
return ret;
}
int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
{
alpm_list_t *i;
alpm_list_t *deps = NULL;
alpm_list_t *resolved = NULL;
int ret = 0;
alpm_trans_t *trans = handle->trans;
if(data) {
*data = NULL;
}
if(_alpm_sync_prepare_pkgs(handle, data, NULL, &resolved) != 0) {
ret = -1;
goto cleanup;
}
if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) {
_alpm_log(handle, ALPM_LOG_DEBUG, "checking dependencies\n"); _alpm_log(handle, ALPM_LOG_DEBUG, "checking dependencies\n");
deps = alpm_checkdeps(handle, _alpm_db_get_pkgcache(handle->db_local), deps = alpm_checkdeps(handle, _alpm_db_get_pkgcache(handle->db_local),
trans->remove, trans->add, 1); trans->remove, trans->add, 1);
if(deps) { if(deps) {
/* It might be solved by adding the missing deps back */
alpm_list_t *extrapkgs = NULL;
alpm_depmissing_t *miss;
alpm_pkg_t *pkg;
int found = 1;
for (i = deps; i; i = i->next) {
miss = i->data;
pkg = alpm_find_dbs_satisfier(handle, handle->dbs_sync, miss->depend->name);
if(pkg && !alpm_pkg_find(trans->add, pkg->name)) {
extrapkgs = alpm_list_add(extrapkgs, pkg);
} else {
found = 0;
}
}
/* trans->add will be updated by _alpm_sync_prepare_pkgs() */
if(!found || _alpm_sync_prepare_pkgs(handle, data, extrapkgs, &resolved) != 0) {
handle->pm_errno = ALPM_ERR_UNSATISFIED_DEPS; handle->pm_errno = ALPM_ERR_UNSATISFIED_DEPS;
ret = -1; ret = -1;
if(data) { if(data) {
@ -668,6 +704,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
goto cleanup; goto cleanup;
} }
} }
}
for(i = trans->add; i; i = i->next) { for(i = trans->add; i; i = i->next) {
/* update download size field */ /* update download size field */
alpm_pkg_t *spkg = i->data; alpm_pkg_t *spkg = i->data;

2
test/pacman/meson.build
View file

@ -348,9 +348,7 @@ xfail_tests = {
# expect failure on 32 bit machines # expect failure on 32 bit machines
'tests/query006.py': cc.sizeof('ssize_t') < 8, 'tests/query006.py': cc.sizeof('ssize_t') < 8,
'tests/replace110.py': true, 'tests/replace110.py': true,
'tests/sync-update-package-removing-required-provides.py': true,
'tests/sync403.py': true, 'tests/sync403.py': true,
'tests/sync406.py': true,
'tests/upgrade078.py': true, 'tests/upgrade078.py': true,
} }

1
test/pacman/tests/sync-update-package-removing-required-provides.py
View file

@ -20,4 +20,3 @@ self.args = "-Su"
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=feature|2-1") self.addrule("PKG_VERSION=feature|2-1")
self.addrule("PKG_VERSION=pkg1|2-1") self.addrule("PKG_VERSION=pkg1|2-1")
self.expectfailure = True

2
test/pacman/tests/sync406.py
View file

@ -27,5 +27,3 @@ self.addrule("PKG_EXIST=qt")
self.addrule("PKG_EXIST=phonon") self.addrule("PKG_EXIST=phonon")
self.addrule("PKG_EXIST=kdeapp") self.addrule("PKG_EXIST=kdeapp")
self.addrule("PKG_VERSION=qt|4.6.1-1") self.addrule("PKG_VERSION=qt|4.6.1-1")
self.expectfailure = True