summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2011-11-24 19:49:07 +0100
committerDan McGee <dan@archlinux.org>2011-12-13 17:44:37 +0100
commit71164b76c4df1ba28d7280136050a84d39490f26 (patch)
tree4c2d7043840890975264fa247f3335a6c0af4668
parent4c5e7af32f91771f3589eedd30ddffb72194fbe7 (diff)
downloadpacman-71164b76c4df1ba28d7280136050a84d39490f26.tar.gz
pacman-71164b76c4df1ba28d7280136050a84d39490f26.tar.xz
sync: avoid checking file conflicts with --dbonly
Scratches my own itch from FS#25667 Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/sync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 3817ec84..534499ae 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -1160,7 +1160,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
trans->state = STATE_COMMITING;
/* fileconflict check */
- if(!(trans->flags & ALPM_TRANS_FLAG_FORCE)) {
+ if(!(trans->flags & (ALPM_TRANS_FLAG_FORCE|ALPM_TRANS_FLAG_DBONLY))) {
EVENT(handle, ALPM_EVENT_FILECONFLICTS_START, NULL, NULL);
_alpm_log(handle, ALPM_LOG_DEBUG, "looking for file conflicts\n");