[75336] trunk/base/src/registry2.0/registry_util.tcl

[jmr at macports.org]

Revision: 75336
          http://trac.macports.org/changeset/75336
Author:   jmr at macports.org
Date:     2011-01-22 01:04:49 -0800 (Sat, 22 Jan 2011)
Log Message:
-----------
when decoding composite version specs, require variant names to contain at least one letter (see #28084)

Modified Paths:
--------------
    trunk/base/src/registry2.0/registry_util.tcl

Modified: trunk/base/src/registry2.0/registry_util.tcl
===================================================================
--- trunk/base/src/registry2.0/registry_util.tcl	2011-01-22 05:54:09 UTC (rev 75335)
+++ trunk/base/src/registry2.0/registry_util.tcl	2011-01-22 09:04:49 UTC (rev 75336)
@@ -52,7 +52,7 @@
 ## @return               true if `specifier` is a valid specifier, else false
 proc decode_spec {specifier version revision variants} {
     upvar 1 $version ver $revision rev $variants var
-    return [regexp {^([^+]+?)(_(\d+)(([-+][^-+]+)*))?$} $specifier - ver - rev var]
+    return [regexp {^([^+]+?)(_(\d+)(([-+][^-+]*[^-+[:digit:]_][^-+]*)*))?$} $specifier - ver - rev var]
 }
 
 ## Checks that the given port has no dependent ports. If it does, throws an
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110122/9b755bec/attachment.html>