From: Kristian Høgsberg <krh@redhat.com>
Date: Wed, 9 Jul 2008 01:56:48 +0000 (-0400)
Subject: Fix old typo in file merging code.
X-Git-Tag: 0.1~64
X-Git-Url: http://project.juiblex.co.uk/git/?a=commitdiff_plain;h=d255e6c8c6c8a2282e35b8b43c1bd8e12e7a6906;p=razor2.git%2F.git

Fix old typo in file merging code.
---

diff --git a/librazor/merger.c b/librazor/merger.c
index 1d1615e..3ca69fa 100644
--- a/librazor/merger.c
+++ b/librazor/merger.c
@@ -284,7 +284,7 @@ merge_one_directory(struct razor_merger *merger, struct merge_directory *md)
 			continue;
 		}
 		if (e1 && !map1[e1 - root1] &&
-		    e2 && !map1[e2 - root2]) {
+		    e2 && !map2[e2 - root2]) {
 			if ((e1++)->flags & RAZOR_ENTRY_LAST)
 				e1 = NULL;
 			if ((e2++)->flags & RAZOR_ENTRY_LAST)