<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/4c0e94ac3a296851696b71de19b29333accf6fd2">https://github.com/macports/macports-base/commit/4c0e94ac3a296851696b71de19b29333accf6fd2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 4c0e94a  More port diagnose fixes
</span>4c0e94a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4c0e94ac3a296851696b71de19b29333accf6fd2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Dec 27 16:31:54 2016 +1100

<span style='display:block; white-space:pre;color:#404040;'>    More port diagnose fixes
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * "environmental variable" -> "environment variable"
</span><span style='display:block; white-space:pre;color:#404040;'>    * whitespace
</span>---
 src/macports1.0/diagnose.tcl | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/diagnose.tcl b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9fb3225..717f2d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@
</span> # Done:
 # Add -q for quiet mode, where we don't print anything
 # Check for command line tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Check for any DYLD_* environmental variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Check for any DYLD_* environment variables
</span> # Check for '.la' in dylib and '.prl'
 # Check if installed files are readable
 # Check for sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,14 +94,14 @@ namespace eval diagnose {
</span>                                     xcode_version_${macports::macosx_version} xcode_build]
 
         set user_config_path        "${macports::autoconf::macports_conf_path}/port_diagnose.ini"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        set xcode_config_path       [macports::getdefaultportresourcepath "macports1.0/xcode_versions.ini"] 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set xcode_config_path       [macports::getdefaultportresourcepath "macports1.0/xcode_versions.ini"]
</span> 
         # Make sure the xcode config exists
         check_xcode_config $xcode_config_path
 
         # Read the config files
         get_config config_options $parser_options $user_config_path
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        get_config config_options $parser_options $xcode_config_path 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        get_config config_options $parser_options $xcode_config_path
</span>         if {![info exists config_options(macports_location)]} {
             set config_options(macports_location) "${macports::prefix}"
         }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +176,7 @@ namespace eval diagnose {
</span> 
     proc check_for_dyld {} {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Checks to see if the current MacPorts session is running with a DYLD_* environmental
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Checks to see if the current MacPorts session is running with a DYLD_* environment
</span>         # variable set.
         #
         # Args:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,13 +184,13 @@ namespace eval diagnose {
</span>         # Returns:
         #           None
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        output "DYLD_* environmental variables"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        output "DYLD_* environment variables"
</span> 
         set printenv        [exec printenv]
         set split           [split $printenv]
 
         if {[regexp {DYLD_.} $split]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            ui_warn "found a DYLD_* environmental variable. These are known to cause issues with MacPorts. Please\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ui_warn "found a DYLD_* environment variable. These are known to cause issues with MacPorts. Please\
</span>                      unset the variable for the duration MacPorts is running."
 
             success_fail 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -280,7 +280,7 @@ namespace eval diagnose {
</span>             return
         }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        success_fail 1 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        success_fail 1
</span> 
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -303,7 +303,7 @@ namespace eval diagnose {
</span> 
             success_fail 0
             return
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        } 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span> 
         success_fail 1
     }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -443,7 +443,7 @@ namespace eval diagnose {
</span>         foreach app $apps {
             set name [$app name]
             output "'${name} @[$app version]_[$app revision][$app variants]'s tarball on disk"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>             if {![file exists [$app location]]} {
                 ui_warn "couldn't find the archive for '$name'. Please uninstall and reinstall this port."
                 success_fail 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -597,7 +597,7 @@ namespace eval diagnose {
</span> 
         output "correct Xcode version"
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        upvar $config_options config 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        upvar $config_options config
</span> 
         set mac_version     ${macports::macosx_version}
         set xcode_current   ${macports::xcodeversion}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -646,13 +646,13 @@ namespace eval diagnose {
</span>         #           parser_options - The list responsible for holding each option to set/look for in the configuration file.
         #           path           - The path to the correct config_file
         # Returns:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        #           None. 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        #           None.
</span> 
         if {![file isfile $path]} {
             return
         }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        upvar $config_options config 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        upvar $config_options config
</span> 
         set fd   [open $path r]
         set text [read $fd]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -686,7 +686,7 @@ namespace eval diagnose {
</span> 
     proc check_path {port_loc profile_path shell_loc} {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Checks to see if port_location/bin and port_location/sbin are in the environmental $PATH variable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Checks to see if port_location/bin and port_location/sbin are in the $PATH environment variable.
</span>         # If they aren't, it appends it to the correct shell's profile file.
         #
         # Args:
</pre><pre style='margin:0'>

</pre>