Changeset 138522 for trunk/base


Ignore:
Timestamp:
Jul 10, 2015, 11:48:16 PM (5 years ago)
Author:
jmr@…
Message:

short-circuit prefix_unwritable calls so the error message is not printed when it's not relevant

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port/port.tcl

    r138521 r138522  
    27562756
    27572757proc action_upgrade { action portlist opts } {
    2758     if {[require_portlist portlist "yes"] || ([prefix_unwritable] && ![macports::global_option_isset ports_dryrun])} {
     2758    if {[require_portlist portlist "yes"] || (![macports::global_option_isset ports_dryrun] && [prefix_unwritable])} {
    27592759        return 1
    27602760    }
     
    31673167        }
    31683168    }
    3169     if {[prefix_unwritable] && ![macports::global_option_isset ports_dryrun]} {
     3169    if {![macports::global_option_isset ports_dryrun] && [prefix_unwritable]} {
    31703170        return 1
    31713171    }
     
    40504050        return 1
    40514051    }
    4052     if {($action eq "install" || $action eq "archive") && [prefix_unwritable] && ![macports::global_option_isset ports_dryrun]} {
     4052    if {($action eq "install" || $action eq "archive") && ![macports::global_option_isset ports_dryrun] && [prefix_unwritable]} {
    40534053        return 1
    40544054    }
Note: See TracChangeset for help on using the changeset viewer.