diff options
| author | Allan McRae <allan@archlinux.org> | 2011-07-02 02:01:39 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-07-02 02:01:39 +1000 |
| commit | 39262acab6b956bbc4491d3b90e967a09828e732 (patch) | |
| tree | 4ee755d8b2d28f16be40cca77f80e6e2f0a5fbfe /lib/libalpm/sync.c | |
| parent | ca43fdd92f06a6997c53e45bfed6fb27f3044de5 (diff) | |
| download | pacman-39262acab6b956bbc4491d3b90e967a09828e732.tar.xz | |
Prefix alpm_transflag_t members with ALPM
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index c82665fc..410cbc7d 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -315,7 +315,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) *data = NULL; } - if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { + if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { alpm_list_t *resolved = NULL; /* target list after resolvedeps */ /* Build up list by repeatedly resolving each transaction package */ @@ -394,7 +394,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL); } - if(!(trans->flags & PM_TRANS_FLAG_NOCONFLICTS)) { + if(!(trans->flags & ALPM_TRANS_FLAG_NOCONFLICTS)) { /* check for inter-conflicts and whatnot */ EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL); @@ -523,7 +523,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } } - if(!(trans->flags & PM_TRANS_FLAG_NODEPS)) { + if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { _alpm_log(handle, ALPM_LOG_DEBUG, "checking dependencies\n"); deps = alpm_checkdeps(handle, _alpm_db_get_pkgcache(handle->db_local), trans->remove, trans->add, 1); @@ -904,7 +904,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) RET_ERR(handle, PM_ERR_PKG_INVALID, -1); } - if(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY) { + if(trans->flags & ALPM_TRANS_FLAG_DOWNLOADONLY) { return 0; } @@ -913,7 +913,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) replaces = alpm_list_count(trans->remove); /* fileconflict check */ - if(!(trans->flags & PM_TRANS_FLAG_FORCE)) { + if(!(trans->flags & ALPM_TRANS_FLAG_FORCE)) { EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL); _alpm_log(handle, ALPM_LOG_DEBUG, "looking for file conflicts\n"); |