X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fsolv%2Ffileconflicts.c;h=2d45bc4cd2ce6b44fd26147a01754177b1efd4a0;hb=ce3d4f8072b41fd5eb64807a3616c7b30f10436c;hp=982de859e45fa211a7724fa195aa624b85c575b1;hpb=5390c526e6b93e97d269cb8a75a699631e5bb189;p=platform%2Fupstream%2Flibsolv.git

diff --git a/examples/solv/fileconflicts.c b/examples/solv/fileconflicts.c
index 982de85..2d45bc4 100644
--- a/examples/solv/fileconflicts.c
+++ b/examples/solv/fileconflicts.c
@@ -67,7 +67,12 @@ checkfileconflicts(Pool *pool, Queue *checkq, int newpkgs, FILE **newpkgsfps, Qu
     {
       printf("\n");
       for (i = 0; i < conflicts->count; i += 6)
-	printf("file %s of package %s conflicts with package %s\n", pool_id2str(pool, conflicts->elements[i]), pool_solvid2str(pool, conflicts->elements[i + 1]), pool_solvid2str(pool, conflicts->elements[i + 4]));
+	{
+	  if (conflicts->elements[i] == conflicts->elements[i + 3])
+	    printf("file %s of package %s conflicts with package %s\n", pool_id2str(pool, conflicts->elements[i]), pool_solvid2str(pool, conflicts->elements[i + 1]), pool_solvid2str(pool, conflicts->elements[i + 4]));
+	  else
+	    printf("file %s of package %s conflicts with file %s of package %s\n", pool_id2str(pool, conflicts->elements[i]), pool_solvid2str(pool, conflicts->elements[i + 1]), pool_id2str(pool, conflicts->elements[i + 3]), pool_solvid2str(pool, conflicts->elements[i + 4]));
+	}
       printf("\n");
     }
   return conflicts->count;