[39023] trunk/base

[ryandesign at macports.org]

Revision: 39023
          http://trac.macosforge.org/projects/macports/changeset/39023
Author:   ryandesign at macports.org
Date:     2008-08-06 01:00:26 -0700 (Wed, 06 Aug 2008)
Log Message:
-----------
ChangeLog: consolidate entries for Leopard environment variable issue

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

Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog	2008-08-06 07:57:46 UTC (rev 39022)
+++ trunk/base/ChangeLog	2008-08-06 08:00:26 UTC (rev 39023)
@@ -5,8 +5,6 @@
 
 
 Unreleased:
-    - Use unsetenv(3) needed in two more places (#16010 and #16233)
-
     - Ruby port group now accepts a new (optional) last parameter for the
       ruby.setup command, "implementation". It is "ruby" by default, and 
       can be set to "ruby19". It names the ruby-implementing port, and can
@@ -74,7 +72,8 @@
     - Declaring a dependency on a nonexistent port now always causes an error
       (#10768, jmr in r36648)
 
-    - Explicitly use unsetenv(3) on all environment variables (#13930)
+    - Explicitly use unsetenv(3) on all environment variables (#13930, #16010,
+      #16233)
 
     - Make the included tclthread compile on Leopard if configured (#13495)
 

Modified: trunk/base/src/port1.0/portlint.tcl
===================================================================
--- trunk/base/src/port1.0/portlint.tcl	2008-08-06 07:57:46 UTC (rev 39022)
+++ trunk/base/src/port1.0/portlint.tcl	2008-08-06 08:00:26 UTC (rev 39023)
@@ -143,6 +143,11 @@
 
 proc lint_main {args} {
 	global UI_PREFIX portname portpath portresourcepath
+	global ports_lint_strict
+	if {[info exists ports_lint_strict] && $ports_lint_strict == "yes"} {
+		ui_info "$UI_PREFIX strict mode enabled"
+	}
+	
 	set portfile ${portpath}/Portfile
 	set portdirs [split ${portpath} /]
 	set last [llength $portdirs]

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2008-08-06 07:57:46 UTC (rev 39022)
+++ trunk/base/src/port1.0/portutil.tcl	2008-08-06 08:00:26 UTC (rev 39023)
@@ -718,6 +718,7 @@
 # Provides "sed in place" functionality
 proc reinplace {args}  {
     set extended 0
+    set quiet 0
     while 1 {
         set arg [lindex $args 0]
         if {[string index $arg 0] eq "-"} {
@@ -726,6 +727,9 @@
                 E {
                     set extended 1
                 }
+                q {
+                    set quiet 1
+                }
                 - {
                     break
                 }
@@ -738,7 +742,7 @@
         }
     }
     if {[llength $args] < 2} {
-        error "reinplace ?-E? pattern file ..."
+        error "reinplace ?-q? ?-E? pattern file ..."
     }
     set pattern [lindex $args 0]
     set files [lrange $args 1 end]
@@ -776,6 +780,14 @@
     
         close $tmpfd
     
+        if {![catch {exec cmp -s $file $tmpfile}]} {
+            if {!$quiet} {
+                ui_warn "[format [msgcat::mc "reinplace %1\$s didn't change anything in %2\$s"] $pattern $file]"
+            } else {
+                ui_info "[format "reinplace %1\$s didn't change anything in %2\$s" $pattern $file]"
+            }
+        }
+    
         set attributes [file attributes $file]
         # We need to overwrite this file
         if {[catch {file attributes $file -permissions u+w} error]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080806/9e31048f/attachment.html