summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-07 23:08:06 -0500
committerDan McGee <dan@archlinux.org>2011-07-05 10:13:20 -0500
commitc748eadc80593c3941b55b1d4ec6e46899abd295 (patch)
tree4d762f6b69e1bc3dc82990fce6258c636cd0ef29 /lib
parent07502f2d82393854f36f5c3ff608458e74fcb747 (diff)
downloadpacman-c748eadc80593c3941b55b1d4ec6e46899abd295.tar.xz
Allow invalid sync DBs to be returned by the library
They are placeholders, but important for things like trying to re-sync a database missing a signature. By using the alpm_db_validity() method at the right time, a client can take the appropriate action with these invalid databases as necessary. In pacman's case, we disallow just about anything that involves looking at a sync database outside of an '-Sy' operation (although we do check the validity immediately after). A few operations are still permitted- '-Q' ops that don't touch sync databases as well as '-R'. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/be_sync.c6
-rw-r--r--lib/libalpm/sync.c8
-rw-r--r--lib/libalpm/trans.c8
3 files changed, 9 insertions, 13 deletions
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index d5d797cf..e3871001 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -596,14 +596,10 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename,
db->handle = handle;
db->siglevel = level;
- if(sync_db_validate(db)) {
- _alpm_db_free(db);
- return NULL;
- }
+ sync_db_validate(db);
handle->dbs_sync = alpm_list_add(handle->dbs_sync, db);
return db;
}
-
/* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 783c7280..1d712797 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -315,6 +315,14 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
*data = NULL;
}
+ /* ensure all sync database are valid since we will be using them */
+ for(i = handle->dbs_sync; i; i = i->next) {
+ const alpm_db_t *db = i->data;
+ if(!(db->status & DB_STATUS_VALID)) {
+ RET_ERR(handle, ALPM_ERR_DB_INVALID, -1);
+ }
+ }
+
if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) {
alpm_list_t *resolved = NULL; /* target list after resolvedeps */
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 26989499..6cea9b7c 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -53,19 +53,11 @@ int SYMEXPORT alpm_trans_init(alpm_handle_t *handle, alpm_transflag_t flags,
alpm_trans_cb_progress progress)
{
alpm_trans_t *trans;
- alpm_list_t *i;
/* Sanity checks */
CHECK_HANDLE(handle, return -1);
ASSERT(handle->trans == NULL, RET_ERR(handle, ALPM_ERR_TRANS_NOT_NULL, -1));
- for(i = handle->dbs_sync; i; i = i->next) {
- const alpm_db_t *db = i->data;
- if(!(db->status & DB_STATUS_VALID)) {
- RET_ERR(handle, ALPM_ERR_DB_INVALID, -1);
- }
- }
-
/* lock db */
if(!(flags & ALPM_TRANS_FLAG_NOLOCK)) {
if(_alpm_handle_lock(handle)) {