[138522] trunk/base/src/port/port.tcl

[jmr at macports.org]

Revision: 138522
          https://trac.macports.org/changeset/138522
Author:   jmr at macports.org
Date:     2015-07-10 16:48:16 -0700 (Fri, 10 Jul 2015)
Log Message:
-----------
short-circuit prefix_unwritable calls so the error message is not printed when it's not relevant

Modified Paths:
--------------
    trunk/base/src/port/port.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2015-07-10 23:40:34 UTC (rev 138521)
+++ trunk/base/src/port/port.tcl	2015-07-10 23:48:16 UTC (rev 138522)
@@ -2755,7 +2755,7 @@
 
 
 proc action_upgrade { action portlist opts } {
-    if {[require_portlist portlist "yes"] || ([prefix_unwritable] && ![macports::global_option_isset ports_dryrun])} {
+    if {[require_portlist portlist "yes"] || (![macports::global_option_isset ports_dryrun] && [prefix_unwritable])} {
         return 1
     }
 
@@ -3166,7 +3166,7 @@
             return 1
         }
     }
-    if {[prefix_unwritable] && ![macports::global_option_isset ports_dryrun]} {
+    if {![macports::global_option_isset ports_dryrun] && [prefix_unwritable]} {
         return 1
     }
 
@@ -4049,7 +4049,7 @@
     if {[require_portlist portlist]} {
         return 1
     }
-    if {($action eq "install" || $action eq "archive") && [prefix_unwritable] && ![macports::global_option_isset ports_dryrun]} {
+    if {($action eq "install" || $action eq "archive") && ![macports::global_option_isset ports_dryrun] && [prefix_unwritable]} {
         return 1
     }
     foreachport $portlist {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150710/4402f1ba/attachment.html>