From 043a49701f5f11429199428a4cc1a084b5f297a9 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 3 Jan 2007 08:05:13 +0000 Subject: * bug fix FS#6100 - fix --print-uris output --- lib/libalpm/sync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/libalpm/sync.c') 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); -- cgit v1.2.3-24-g4f1b