diff options
| author | Dan McGee <dan@archlinux.org> | 2011-08-17 21:06:04 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-18 10:47:41 -0500 |
| commit | c885a953eb888004f0302ed3eceafef93e2f072f (patch) | |
| tree | 676e9d86361ba8af989d8f8277db58e261471518 /lib/libalpm/sync.c | |
| parent | 4a7f3bbc469d1f6a8da1c7f310ab518ad841c2b9 (diff) | |
| download | pacman-c885a953eb888004f0302ed3eceafef93e2f072f.tar.xz | |
Enhance and utilize database status flags
* Move is_local standalone field to status enum
* Create VALID/INVALID flag pair
* Create EXISTS/MISSING flag pair
With these additional fields, we can be more intelligent with database
loading and messages to the user. We now only warn once if a sync
database does not exist and do not continue to try to load it once we
have marked it as missing.
The reason for the flags existing in pairs is so the unknown case can be
represented. There should never be a time when both flags in the same
group are true, but if they are both false, it represents the unknown
case. Care is taken to always manipulate both flags at the same time.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 1807e709..a5964b9d 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -319,9 +319,12 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) /* 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)) { + if(db->status & DB_STATUS_INVALID) { RET_ERR(handle, ALPM_ERR_DB_INVALID, -1); } + if(db->status & DB_STATUS_MISSING) { + RET_ERR(handle, ALPM_ERR_DB_NOT_FOUND, -1); + } } if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { |