[48235] branches/release_1_7

[blb at macports.org]

Revision: 48235
          http://trac.macports.org/changeset/48235
Author:   blb at macports.org
Date:     2009-03-17 01:44:15 -0700 (Tue, 17 Mar 2009)
Log Message:
-----------
Merge r46780 from trunk: portlint.tcl: port lint no longer complains about missing master_sites if there are no distfiles; closes #18479;
Plus a bit of spacing improvement

Modified Paths:
--------------
    branches/release_1_7/base/src/port1.0/portlint.tcl

Property Changed:
----------------
    branches/release_1_7/
    branches/release_1_7/base/


Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46052,46146,46983,47034,47776,47782,48230
/trunk/base:45161
   + /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46052,46146,46780,46983,47034,47776,47782,48230
/trunk/base:45161


Property changes on: branches/release_1_7/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46052,46146,46622-46623,46810,46983,47034,47776,47782,47848,48083,48230
/trunk/base/base:45161,48083
   + /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43902,43946,43954,43960,44363,45161,45201,46052,46146,46622-46623,46780,46810,46983,47034,47776,47782,47848,48083,48230
/trunk/base/base:45161,48083

Modified: branches/release_1_7/base/src/port1.0/portlint.tcl
===================================================================
--- branches/release_1_7/base/src/port1.0/portlint.tcl	2009-03-17 08:36:09 UTC (rev 48234)
+++ branches/release_1_7/base/src/port1.0/portlint.tcl	2009-03-17 08:44:15 UTC (rev 48235)
@@ -300,7 +300,7 @@
     set portarch ${os.arch}
     global description long_description platforms categories all_variants
     global maintainers homepage master_sites checksums patchfiles
-    global depends_lib depends_build depends_run fetch.type
+    global depends_lib depends_build depends_run distfiles fetch.type
     
     global lint_portsystem lint_platforms lint_categories 
     global lint_required lint_optional lint_variants
@@ -332,12 +332,18 @@
             set var $req_var
         }
 
-       if {$var == "master_sites" && ${fetch.type} != "standard"} {
-             ui_info "OK: $var not required for fetch.type ${fetch.type}"
-             continue
-       }
-       
-       if {![info exists $var]} {
+        if {$var == "master_sites"} {
+            if {${fetch.type} != "standard"} {
+                ui_info "OK: $var not required for fetch.type ${fetch.type}"
+                continue
+            }
+            if {[llength ${distfiles}] == 0} {
+                ui_info "OK: $var not required when there are no distfiles"
+                continue
+            }
+        }
+
+        if {![info exists $var]} {
             ui_error "Missing required variable: $req_var"
             incr errors
         } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090317/fdd4c20d/attachment.html>