diff options
author | Dan McGee <dan@archlinux.org> | 2011-06-07 23:08:06 -0500 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-07-05 10:13:20 -0500 |
commit | c748eadc80593c3941b55b1d4ec6e46899abd295 (patch) | |
tree | 4d762f6b69e1bc3dc82990fce6258c636cd0ef29 /src/pacman/sync.c | |
parent | 07502f2d82393854f36f5c3ff608458e74fcb747 (diff) |
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 'src/pacman/sync.c')
-rw-r--r-- | src/pacman/sync.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 5f67236d..26c9ccca 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -738,7 +738,7 @@ static int sync_trans(alpm_list_t *targets) alpm_list_t *i; /* Step 1: create a new transaction... */ - if(trans_init(config->flags) == -1) { + if(trans_init(config->flags, 1) == -1) { return 1; } @@ -885,7 +885,7 @@ int pacman_sync(alpm_list_t *targets) if(config->op_s_clean) { int ret = 0; - if(trans_init(0) == -1) { + if(trans_init(0, 0) == -1) { return 1; } @@ -900,13 +900,12 @@ int pacman_sync(alpm_list_t *targets) return ret; } - /* ensure we have at least one valid sync db set up */ - sync_dbs = alpm_option_get_syncdbs(config->handle); - if(sync_dbs == NULL) { - pm_printf(ALPM_LOG_ERROR, _("no usable package repositories configured.\n")); + if(check_syncdbs(1, 0)) { return 1; } + sync_dbs = alpm_option_get_syncdbs(config->handle); + if(config->op_s_sync) { /* grab a fresh package list */ printf(_(":: Synchronizing package databases...\n")); @@ -916,6 +915,10 @@ int pacman_sync(alpm_list_t *targets) } } + if(check_syncdbs(1, 1)) { + return 1; + } + /* search for a package */ if(config->op_s_search) { return sync_search(sync_dbs, targets); |