Changeset 39023 for trunk/base/src

Timestamp:

08/06/08 01:00:26 (4 months ago)

Author:

ryandesign@…

Message:

ChangeLog: consolidate entries for Leopard environment variable issue

Location:

trunk/base/src/port1.0

Files:

• portlint.tcl (modified) (1 diff)
• portutil.tcl (modified) (4 diffs)

trunk/base/src/port1.0/portlint.tcl

@@ -144 +144 @@
 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} /]

trunk/base/src/port1.0/portutil.tcl

@@ -719 +719 @@
 proc reinplace {args}  {
     set extended 0
+    set quiet 0
     while 1 {
         set arg [lindex $args 0]
@@ -727 +728 @@
                     set extended 1
                 }
+                q {
+                    set quiet 1
+                }
                 - {
                     break
@@ -739 +743 @@
     }
     if {[llength $args] < 2} {
-        error "reinplace ?-E? pattern file ..."
+        error "reinplace ?-q? ?-E? pattern file ..."
     }
     set pattern [lindex $args 0]
@@ -776 +780 @@
     
         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]