Changeset 88794


Ignore:
Timestamp:
Jan 11, 2012, 10:18:56 PM (9 years ago)
Author:
jmr@…
Message:

use a separate macports.conf option to control whether rev-upgrade runs automatically, so it can still be run manually if this is turned off

Location:
trunk/base
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/doc/macports.conf.5

    r88730 r88794  
    220220.It Va extra_env
    221221List of extra environment variables MacPorts should keep in the user's environment when sanitizing it.
     222.It Va revupgrade_autorun
     223Controls whether the rev-upgrade action will be run automatically after
     224upgrading ports.
     225.br
     226.Ic Default:
     227yes
    222228.It Va revupgrade_mode
    223 Controls the rev-upgrade functionality which checks for broken linking and
    224 rebuilds ports to fix it. 'rebuild' means ports will automatically be rebuilt
    225 when broken linking is detected in their files, 'report' means broken files
    226 will be scanned for and reported but the ports will not be rebuilt, and 'off'
    227 means linking will not be checked at all.
     229Controls the rev-upgrade functionality which checks for broken linking and can
     230rebuild ports to fix it. 'rebuild' means ports will automatically be rebuilt
     231when broken linking is detected in their files, while 'report' means broken
     232files will be scanned for and reported but the ports will not be rebuilt.
    228233.br
    229234.Ic Default:
  • trunk/base/doc/macports.conf.in

    r88730 r88794  
    138138#proxy_skip            internal1, internal2, internal3
    139139
    140 # Option controlling rev-upgrade, which checks for broken linking and rebuilds
    141 # affected ports. Possible values are 'rebuild' (default), 'report', or 'off'.
     140# Set whether to automatically run rev-upgrade after upgrading ports
     141#revupgrade_autorun yes
     142# Option controlling action taken by rev-upgrade, which checks for broken
     143# linking and can rebuild affected ports. Possible values are
     144#'rebuild' (default) or 'report'.
    142145#revupgrade_mode rebuild
  • trunk/base/src/macports1.0/macports.tcl

    r88735 r88794  
    5050        applications_dir frameworks_dir developer_dir universal_archs build_arch macosx_deployment_target \
    5151        macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip \
    52         master_site_local patch_site_local archive_site_local buildfromsource revupgrade_mode revupgrade_check_id_loadcmds"
     52        master_site_local patch_site_local archive_site_local buildfromsource revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds"
    5353    variable user_options "submitter_name submitter_email submitter_key"
    5454    variable portinterp_options "\
     
    848848    }
    849849
     850    if {![info exists macports::revupgrade_autorun]} {
     851        set macports::revupgrade_autorun yes
     852    }
    850853    if {![info exists macports::revupgrade_mode]} {
    851854        set macports::revupgrade_mode "rebuild"
     
    38633866
    38643867proc macports::revupgrade {opts} {
    3865     if {${macports::revupgrade_mode} == "off"} {
    3866         return 0
    3867     }
    38683868    set run_loop 1
    38693869    array set broken_port_counts {}
  • trunk/base/src/port/port.tcl

    r88793 r88794  
    25952595    } else {
    25962596        array set options $opts
    2597         if {![info exists options(ports_upgrade_no-rev-upgrade)]} {
     2597        if {![info exists options(ports_upgrade_no-rev-upgrade)] && ${macports::revupgrade_autorun}} {
    25982598            set status [action_revupgrade $action $portlist $opts]
    25992599        }
     
    39223922    } elseif {$action == "install"} {
    39233923        array set options $opts
    3924         if {![info exists options(ports_nodeps)] && ![info exists options(ports_install_no-rev-upgrade)]} {
     3924        if {![info exists options(ports_nodeps)] && ![info exists options(ports_install_no-rev-upgrade)] && ${macports::revupgrade_autorun}} {
    39253925            set status [action_revupgrade $action $portlist $opts]
    39263926        }
Note: See TracChangeset for help on using the changeset viewer.