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

Allow sync_prepare to work in certain cases without sync databases

Browse source 
When doing a bare -U operation on a local package that doesn't pull in
any dependencies from the sync databases, we can get away with missing
database files. This makes the check conditional on no sync targets
found in the target list. This is not the prettiest code here so we have
a bit of hackish behavior required to straighten both the behavior and
the nonsensical error message out.

Addresses FS#26899.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-11-15 09:12:18 -06:00
parent 37ff0f5658
commit 9363e7dc22
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/libalpm/deps.c
View file

@ -631,7 +631,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep,
/* first check if one provider is already installed locally */ /* first check if one provider is already installed locally */
for(i = providers; i; i = i->next) { for(i = providers; i; i = i->next) {
alpm_pkg_t *pkg = i->data; alpm_pkg_t *pkg = i->data;
if(_alpm_pkghash_find(_alpm_db_get_pkgcache_hash(handle->db_local), pkg->name)) { if(_alpm_db_get_pkgfromcache(handle->db_local, pkg->name)) {
alpm_list_free(providers); alpm_list_free(providers);
return pkg; return pkg;
} }

27
lib/libalpm/sync.c
View file

@ -357,7 +357,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
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;
alpm_list_t *remove = NULL; size_t from_sync = 0;
int ret = 0; int ret = 0;
alpm_trans_t *trans = handle->trans; alpm_trans_t *trans = handle->trans;
@ -365,19 +365,27 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
*data = NULL; *data = NULL;
} }
/* ensure all sync database are valid since we will be using them */ for(i = trans->add; i; i = i->next) {
alpm_pkg_t *spkg = i->data;
from_sync += (spkg->origin == PKG_FROM_SYNCDB);
}
/* ensure all sync database are valid if we will be using them */
for(i = handle->dbs_sync; i; i = i->next) { for(i = handle->dbs_sync; i; i = i->next) {
const alpm_db_t *db = i->data; const alpm_db_t *db = i->data;
if(db->status & DB_STATUS_INVALID) { if(db->status & DB_STATUS_INVALID) {
RET_ERR(handle, ALPM_ERR_DB_INVALID, -1); RET_ERR(handle, ALPM_ERR_DB_INVALID, -1);
} }
if(db->status & DB_STATUS_MISSING) { /* missing databases are not allowed if we have sync targets */
if(from_sync && db->status & DB_STATUS_MISSING) {
RET_ERR(handle, ALPM_ERR_DB_NOT_FOUND, -1); RET_ERR(handle, ALPM_ERR_DB_NOT_FOUND, -1);
} }
} }
if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) {
alpm_list_t *resolved = NULL; /* target list after resolvedeps */ alpm_list_t *resolved = NULL;
alpm_list_t *remove = NULL;
alpm_list_t *localpkgs;
/* Build up list by repeatedly resolving each transaction package */ /* Build up list by repeatedly resolving each transaction package */
/* Resolve targets dependencies */ /* Resolve targets dependencies */
@ -394,7 +402,7 @@ 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) */
alpm_list_t *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); trans->add, _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
@ -409,11 +417,13 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
dependencies not already on the list */ dependencies not already on the list */
} }
alpm_list_free(localpkgs); alpm_list_free(localpkgs);
alpm_list_free(remove);
/* If there were unresolvable top-level packages, prompt the user to /* If there were unresolvable top-level packages, prompt the user to
see if they'd like to ignore them rather than failing the sync */ see if they'd like to ignore them rather than failing the sync */
if(unresolvable != NULL) { if(unresolvable != NULL) {
int remove_unresolvable = 0; int remove_unresolvable = 0;
enum _alpm_errno_t saved_err = handle->pm_errno;
QUESTION(handle, ALPM_QUESTION_REMOVE_PKGS, unresolvable, QUESTION(handle, ALPM_QUESTION_REMOVE_PKGS, unresolvable,
NULL, NULL, &remove_unresolvable); NULL, NULL, &remove_unresolvable);
if(remove_unresolvable) { if(remove_unresolvable) {
@ -421,14 +431,15 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
transaction. The packages will be removed from the actual transaction. The packages will be removed from the actual
transaction when the transaction packages are replaced with a transaction when the transaction packages are replaced with a
dependency-reordered list below */ dependency-reordered list below */
handle->pm_errno = 0; /* pm_errno was set by resolvedeps */ handle->pm_errno = 0;
if(data) { if(data) {
alpm_list_free_inner(*data, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free_inner(*data, (alpm_list_fn_free)_alpm_depmiss_free);
alpm_list_free(*data); alpm_list_free(*data);
*data = NULL; *data = NULL;
} }
} else { } else {
/* pm_errno is set by resolvedeps */ /* pm_errno was set by resolvedeps, callback may have overwrote it */
handle->pm_errno = saved_err;
alpm_list_free(resolved); alpm_list_free(resolved);
ret = -1; ret = -1;
goto cleanup; goto cleanup;
@ -617,8 +628,6 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
} }
cleanup: cleanup:
alpm_list_free(remove);
return ret; return ret;
} }