summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/db.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-08-18 04:06:04 +0200
committerDan McGee <dan@archlinux.org>2011-08-18 17:47:41 +0200
commitc885a953eb888004f0302ed3eceafef93e2f072f (patch)
tree676e9d86361ba8af989d8f8277db58e261471518 /lib/libalpm/db.h
parent4a7f3bbc469d1f6a8da1c7f310ab518ad841c2b9 (diff)
downloadpacman-c885a953eb888004f0302ed3eceafef93e2f072f.tar.gz
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/db.h')
-rw-r--r--lib/libalpm/db.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h
index 2938b54a..88f6c686 100644
--- a/lib/libalpm/db.h
+++ b/lib/libalpm/db.h
@@ -47,8 +47,13 @@ typedef enum _alpm_dbinfrq_t {
/** Database status. Bitflags. */
enum _alpm_dbstatus_t {
DB_STATUS_VALID = (1 << 0),
- DB_STATUS_PKGCACHE = (1 << 1),
- DB_STATUS_GRPCACHE = (1 << 2)
+ DB_STATUS_INVALID = (1 << 1),
+ DB_STATUS_EXISTS = (1 << 2),
+ DB_STATUS_MISSING = (1 << 3),
+
+ DB_STATUS_LOCAL = (1 << 10),
+ DB_STATUS_PKGCACHE = (1 << 11),
+ DB_STATUS_GRPCACHE = (1 << 12)
};
struct db_operations {
@@ -63,16 +68,13 @@ struct __alpm_db_t {
char *treename;
/* do not access directly, use _alpm_db_path(db) for lazy access */
char *_path;
- /* also indicates whether we are RO or RW */
- int is_local;
- /* flags determining validity, loaded caches, etc. */
- enum _alpm_dbstatus_t status;
alpm_pkghash_t *pkgcache;
alpm_list_t *grpcache;
alpm_list_t *servers;
- alpm_siglevel_t siglevel;
-
struct db_operations *ops;
+ /* flags determining validity, local, loaded caches, etc. */
+ enum _alpm_dbstatus_t status;
+ alpm_siglevel_t siglevel;
};