summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-10-15 23:31:21 +0000
committerAaron Griffin <aaron@archlinux.org>2006-10-15 23:31:21 +0000
commit42aae4aa7b47113a66e8d1582701590eeb930045 (patch)
treef415cba72154ed7f77e9508a3c45df0b023576eb /lib
parent3bed58f0705a6a208b8d5cabc90327f7b39fe4c9 (diff)
Applied changes from frugalware:
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=commitdiff;h=20061009002226-e2957-93b82621b6b060312559ea0539699f659bd9cb97.gz
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/conflict.c4
-rw-r--r--lib/libalpm/po/stamp-po1
2 files changed, 1 insertions, 4 deletions
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