[37507] branches/variant-descs-14482/base/src/port1.0/portlint.tcl

[raimue at macports.org]

Revision: 37507
          http://trac.macosforge.org/projects/macports/changeset/37507
Author:   raimue at macports.org
Date:     2008-06-10 07:04:54 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
port1.0/portutil.tcl:
Don't warn about a missing description if it is set global,
but warn if the variant overrides the global description

Modified Paths:
--------------
    branches/variant-descs-14482/base/src/port1.0/portlint.tcl

Modified: branches/variant-descs-14482/base/src/port1.0/portlint.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/portlint.tcl	2008-06-10 11:21:24 UTC (rev 37506)
+++ branches/variant-descs-14482/base/src/port1.0/portlint.tcl	2008-06-10 14:04:54 UTC (rev 37507)
@@ -142,7 +142,7 @@
 }
 
 proc lint_main {args} {
-	global UI_PREFIX portname portpath portresourcepath
+	global UI_PREFIX portname portpath porturl portresourcepath
 	set portfile ${portpath}/Portfile
 	set portdirs [split ${portpath} /]
 	set last [llength $portdirs]
@@ -399,13 +399,19 @@
             if {![info exists variantdesc] || $variantdesc == ""} {
                 # don't warn about missing descriptions for global variants
                 if {[lsearch -exact $local_variants $variantname] != -1 &&
-                    [lsearch -exact $lint_variants $variantname] == -1} {
+                    [lsearch -exact $lint_variants $variantname] == -1 && 
+                    [variant_desc $porturl $variantname] == ""} {
                     ui_warn "Variant $variantname does not have a description"
                     incr warnings
                     set desc_ok false
                 } elseif {$variantdesc == ""} {
                     set variantdesc "(pre-defined variant)"
                 }
+            } else {
+                if {[variant_desc $porturl $variantname] != ""} {
+                    ui_warn "Variant $variantname overrides global description"
+                    incr warnings
+                }
             }
 
             if {$name_ok} {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080610/395bae93/attachment.htm