Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=15eeecc1a13673b55e3131fecc5dcd93b36983ea

commit 15eeecc1a13673b55e3131fecc5dcd93b36983ea
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date:   Fri Jul 4 15:29:13 2008 +0200

_pacman_db_find_conflicts(): fix error message when the same file exists in two 
targets

diff --git a/lib/libpacman/conflict.c b/lib/libpacman/conflict.c
index 49d8a8c..9cd3d4f 100644
--- a/lib/libpacman/conflict.c
+++ b/lib/libpacman/conflict.c
@@ -286,7 +286,7 @@ pmlist_t *_pacman_db_find_conflicts(pmdb_t *db, pmtrans_t 
*trans, char *root, pm
}
conflict->type = PM_CONFLICT_TYPE_TARGET;
STRNCPY(conflict->target, p1->name, PKG_NAME_LEN);
-                                               STRNCPY(conflict->file, 
j->data, CONFLICT_FILE_LEN);
+                                               STRNCPY(conflict->file, 
k->data, CONFLICT_FILE_LEN);
STRNCPY(conflict->ctarget, p2->name, PKG_NAME_LEN);
conflicts = _pacman_list_add(conflicts, conflict);
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to