diff options
author | Aaron Griffin <aaron@archlinux.org> | 2007-01-03 09:05:13 +0100 |
---|---|---|
committer | Aaron Griffin <aaron@archlinux.org> | 2007-01-03 09:05:13 +0100 |
commit | 043a49701f5f11429199428a4cc1a084b5f297a9 (patch) | |
tree | 262f6805d7cd8299c729cb4e4362ef45bcd327d1 /lib/libalpm/sync.c | |
parent | 50030f778a59394c5aab2ee484e0123f88581fcc (diff) | |
download | pacman-043a49701f5f11429199428a4cc1a084b5f297a9.tar.gz pacman-043a49701f5f11429199428a4cc1a084b5f297a9.tar.xz |
* bug fix FS#6100 - fix --print-uris output
Diffstat (limited to 'lib/libalpm/sync.c')
-rw-r--r-- | lib/libalpm/sync.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 956ebf47..0234861f 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -489,7 +489,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync, p FREELISTPTR(trail); } - if(!(trans->flags & PM_TRANS_FLAG_NOCONFLICTS)) { + /* We don't care about conflicts if we're just printing uris */ + if(!(trans->flags & (PM_TRANS_FLAG_NOCONFLICTS | PM_TRANS_FLAG_PRINTURIS))) { /* check for inter-conflicts and whatnot */ EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL); |