[112064] trunk/base

[ryandesign at macports.org]

Revision: 112064
          https://trac.macports.org/changeset/112064
Author:   ryandesign at macports.org
Date:     2013-10-10 16:08:05 -0700 (Thu, 10 Oct 2013)
Log Message:
-----------
portlint.tcl: fix port lint to recognize that portgroup names can contain uppercase letters (#40733)

Modified Paths:
--------------
    trunk/base/ChangeLog
    trunk/base/src/port1.0/portlint.tcl

Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog	2013-10-10 22:24:41 UTC (rev 112063)
+++ trunk/base/ChangeLog	2013-10-10 23:08:05 UTC (rev 112064)
@@ -6,6 +6,8 @@
 Release 2.3 (unreleased)
     - Add -prepend command for options (similar to existing -append
       command) (#40655, ryandesign in r111990)
+    - Fix incorrect lint messages when an uppercase letter is used in a
+      PortGroup name (#40733, ryandesign in r112064)
 
 Release 2.2.1 (unreleased)
     - Provide choice of GCC version when compiling with DragonEgg.

Modified: trunk/base/src/port1.0/portlint.tcl
===================================================================
--- trunk/base/src/port1.0/portlint.tcl	2013-10-10 22:24:41 UTC (rev 112063)
+++ trunk/base/src/port1.0/portlint.tcl	2013-10-10 23:08:05 UTC (rev 112064)
@@ -204,7 +204,7 @@
             set require_after "PortSystem"
         }
         if {[string match "PortGroup*" $line]} {
-            regexp {PortGroup\s+([a-z0-9_]+)\s+([0-9.]+)} $line -> portgroup portgroupversion
+            regexp {PortGroup\s+([A-Za-z0-9_]+)\s+([0-9.]+)} $line -> portgroup portgroupversion
             if {![info exists portgroup]} {
                 ui_error "Line $lineno has unrecognized PortGroup"
                 incr errors
@@ -271,7 +271,7 @@
     
             if {!$hashline
                     && ![regexp {^\s*PortSystem|^\s*PortGroup|^\s*version} $line]
-                    && ![regexp {^\s*[a-z0-9]+\.setup} $line]
+                    && ![regexp {^\s*[A-Za-z0-9_]+\.setup} $line]
                     && [string first [option version] $line] != -1} {
                 ui_warn "Line $lineno seems to hardcode the version number, consider using \${version} instead"
                 incr warnings
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131010/67433b3a/attachment.html>