From 42aae4aa7b47113a66e8d1582701590eeb930045 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Sun, 15 Oct 2006 23:31:21 +0000 Subject: Applied changes from frugalware: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=commitdiff;h=20061009002226-e2957-93b82621b6b060312559ea0539699f659bd9cb97.gz --- lib/libalpm/conflict.c | 4 +--- lib/libalpm/po/stamp-po | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 lib/libalpm/po/stamp-po (limited to 'lib') diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 8a11ca31..8cfe0f6e 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -244,10 +244,8 @@ PMList *_alpm_db_find_conflicts(pmdb_t *db, PMList *targets, char *root, PMList } } } - } - /* CHECK 2: check every target against the filesystem */ - for(i = targets; i; i = i->next) { + /* CHECK 2: check every target against the filesystem */ pmpkg_t *p = (pmpkg_t*)i->data; pmpkg_t *dbpkg = NULL; for(j = p->files; j; j = j->next) { diff --git a/lib/libalpm/po/stamp-po b/lib/libalpm/po/stamp-po deleted file mode 100644 index 9788f702..00000000 --- a/lib/libalpm/po/stamp-po +++ /dev/null @@ -1 +0,0 @@ -timestamp -- cgit v1.2.3