From: Keith Marshall <keithmarshall@users.sourceforge.net>
Date: Tue, 1 Oct 2013 12:49:35 +0000 (+0100)
Subject: Correct processing of package group associations.
X-Git-Tag: r0-6-2-beta-20131004-1~3
X-Git-Url: http://git.osdn.net/view?p=mingw%2Fmingw-get.git;a=commitdiff_plain;h=621cf63af22f3ff17225ca5895595d6bb4f4d260

Correct processing of package group associations.
---

diff --git a/ChangeLog b/ChangeLog
index c8f1d38..43df91f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-01  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+	Correct processing of package group associations.
+
+	* src/pkgtree.cpp (AppWindowMaker::IsPackageGroupAffiliate): Iterate
+	over "affiliate_key" elements in FindNextAssociate() calls; original
+	implementation was incorrectly iterating over "group_key" elements.
+
 2013-09-21  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
 	Reorder controls within "Apply Changes" dialogue.
diff --git a/src/pkgtree.cpp b/src/pkgtree.cpp
index 62ac2ee..64696d6 100644
--- a/src/pkgtree.cpp
+++ b/src/pkgtree.cpp
@@ -466,7 +466,7 @@ bool AppWindowMaker::IsPackageGroupAffiliate( pkgXmlNode *package )
        * check for any further "affiliate" declarations at the
        * current level within the XML document hierarchy...
        */
-      group = group->FindNextAssociate( group_key );
+      group = group->FindNextAssociate( affiliate_key );
     }
     /* ...and at enclosing levels, as may be necessary.
      */