diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-07-08 21:56:48 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-07-08 21:56:53 -0400 |
| commit | d255e6c8c6c8a2282e35b8b43c1bd8e12e7a6906 (patch) | |
| tree | 0bce8acc3d66ac6a348cbc029d82ed847bfdcc22 | |
| parent | a54a032daaf935da3006902c7fbc7064026cd158 (diff) | |
Fix old typo in file merging code.
| -rw-r--r-- | librazor/merger.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |