Commit: 621cf63af22f3ff17225ca5895595d6bb4f4d260 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Révision: 621cf63af22f3ff17225ca5895595d6bb4f4d260 (tree)
• l'heure: 2013-10-01 21:49:35
• Auteur: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Message de Log

Correct processing of package group associations.

Change Summary

• modified: ChangeLog
• modified: src/pkgtree.cpp

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	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  <[e-mail]>
 
 	Reorder controls within "Apply Changes" dialogue.

--- 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.
      */