Handle "%" wildcard matches in package and subsystem version strings.

[mingw/mingw-get.git] / src / pkgdeps.cpp

diff --git a/src/pkgdeps.cpp b/src/pkgdeps.cpp
index 6ba5df7..61c775a 100644 (file)
--- a/src/pkgdeps.cpp
+++ b/src/pkgdeps.cpp
@@ -127,6 +127,9 @@ pkgXmlDocument::ResolveDependencies( pkgXmlNode* package, pkgActionItem* rank )
    * of such prerequisites, and finally, extend the search to capture
    * additional dependencies common to the containing package group.
    */
+  pkgSpecs *refdata = NULL;
+  pkgXmlNode *refpkg = package;
+
   while( package != NULL )
   {
     /* We have a valid XML entity, which may identify dependencies;
@@ -140,10 +143,24 @@ pkgXmlDocument::ResolveDependencies( pkgXmlNode* package, pkgActionItem* rank )
        */
       pkgXmlNode *installed = NULL;
 
+      /* To facilitate resolution of "%" version matching wildcards
+       * in the requirements specification, we need to parse the version
+       * specification for the current dependent package...
+       */
+      if( refdata == NULL )
+      {
+       /* ...but we deferred that until we knew for sure that it would
+        * be needed; it is, so parse it now.
+        */
+       const char *refname;
+       if( (refname = refpkg->GetPropVal( tarname_key, NULL )) != NULL )
+         refdata = new pkgSpecs( refname );
+      }
+
       /* Identify the prerequisite package, from its canonical name...
        */
       pkgActionItem wanted; pkgXmlNode *selected;
-      pkgSpecs req( wanted.SetRequirements( dep ) );
+      pkgSpecs req( wanted.SetRequirements( dep, refdata ) );
       /*
        * (Both the package name, and subsystem if specified, must match)...
        */
@@ -246,6 +263,7 @@ pkgXmlDocument::ResolveDependencies( pkgXmlNode* package, pkgActionItem* rank )
      */
     package = package->GetParent();
   }
+  delete refdata;
 }
 
 void pkgXmlDocument::Schedule( unsigned long action, const char* name )