diff options
| author | Dan McGee <dan@archlinux.org> | 2008-05-11 19:00:18 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2010-10-13 15:53:18 +0200 |
| commit | d1126db1281596ba8ea960bfa963e86731d28b5e (patch) | |
| tree | 4201eb0da47075c27b65e38eea4f4046a25861f4 /lib/libalpm/sync.c | |
| parent | 49176461a6b476e673e232075c95f07963750f74 (diff) | |
| download | pacman-d1126db1281596ba8ea960bfa963e86731d28b5e.tar.gz pacman-d1126db1281596ba8ea960bfa963e86731d28b5e.tar.xz | |
Allow local and sync db to be treated separately
Implement this seemingly simple change in package.h:
typedef enum _pmpkgfrom_t {
- PKG_FROM_CACHE = 1,
- PKG_FROM_FILE
+ PKG_FROM_FILE = 1,
+ PKG_FROM_LOCALDB,
+ PKG_FROM_SYNCDB
} pmpkgfrom_t;
which requires flushing out several assumptions from around the codebase
with regards to usage of the PKG_FROM_CACHE value. Make some changes where
required to allow the switch, and now the correct value should be set (via a
crude hack) depending on whether a package was loaded as an entry in a local
db or a sync db.
This patch underwent some big rebasing from Allan and Dan.
Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index f8193962..9e155b6e 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -832,7 +832,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) for(j = trans->add; j; j = j->next) { pmpkg_t *spkg = j->data; - if(spkg->origin == PKG_FROM_CACHE && current == spkg->origin_data.db) { + if(spkg->origin != PKG_FROM_FILE && current == spkg->origin_data.db) { const char *fname = NULL; fname = alpm_pkg_get_filename(spkg); |