[88794] trunk/base

[jmr at macports.org]

Revision: 88794
          http://trac.macports.org/changeset/88794
Author:   jmr at macports.org
Date:     2012-01-11 14:18:56 -0800 (Wed, 11 Jan 2012)
Log 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

Modified Paths:
--------------
    trunk/base/doc/macports.conf.5
    trunk/base/doc/macports.conf.in
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port/port.tcl

Modified: trunk/base/doc/macports.conf.5
===================================================================
--- trunk/base/doc/macports.conf.5	2012-01-11 21:58:38 UTC (rev 88793)
+++ trunk/base/doc/macports.conf.5	2012-01-11 22:18:56 UTC (rev 88794)
@@ -219,12 +219,17 @@
 ${prefix}/bin:${prefix}/sbin:/bin:/sbin:/usr/bin:/usr/sbin
 .It Va extra_env
 List of extra environment variables MacPorts should keep in the user's environment when sanitizing it.
+.It Va revupgrade_autorun
+Controls whether the rev-upgrade action will be run automatically after
+upgrading ports.
+.br
+.Ic Default:
+yes
 .It Va revupgrade_mode
-Controls the rev-upgrade functionality which checks for broken linking and
-rebuilds ports to fix it. 'rebuild' means ports will automatically be rebuilt
-when broken linking is detected in their files, 'report' means broken files
-will be scanned for and reported but the ports will not be rebuilt, and 'off'
-means linking will not be checked at all.
+Controls the rev-upgrade functionality which checks for broken linking and can
+rebuild ports to fix it. 'rebuild' means ports will automatically be rebuilt
+when broken linking is detected in their files, while 'report' means broken
+files will be scanned for and reported but the ports will not be rebuilt.
 .br
 .Ic Default:
 rebuild

Modified: trunk/base/doc/macports.conf.in
===================================================================
--- trunk/base/doc/macports.conf.in	2012-01-11 21:58:38 UTC (rev 88793)
+++ trunk/base/doc/macports.conf.in	2012-01-11 22:18:56 UTC (rev 88794)
@@ -137,6 +137,9 @@
 # and FTP, but not rsync):
 #proxy_skip            internal1, internal2, internal3
 
-# Option controlling rev-upgrade, which checks for broken linking and rebuilds
-# affected ports. Possible values are 'rebuild' (default), 'report', or 'off'.
+# Set whether to automatically run rev-upgrade after upgrading ports
+#revupgrade_autorun yes
+# Option controlling action taken by rev-upgrade, which checks for broken
+# linking and can rebuild affected ports. Possible values are
+#'rebuild' (default) or 'report'.
 #revupgrade_mode rebuild

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2012-01-11 21:58:38 UTC (rev 88793)
+++ trunk/base/src/macports1.0/macports.tcl	2012-01-11 22:18:56 UTC (rev 88794)
@@ -49,7 +49,7 @@
         mp_remote_url mp_remote_submit_url configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \
         applications_dir frameworks_dir developer_dir universal_archs build_arch macosx_deployment_target \
         macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip \
-        master_site_local patch_site_local archive_site_local buildfromsource revupgrade_mode revupgrade_check_id_loadcmds"
+        master_site_local patch_site_local archive_site_local buildfromsource revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds"
     variable user_options "submitter_name submitter_email submitter_key"
     variable portinterp_options "\
         portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \
@@ -847,6 +847,9 @@
         set macports::macosx_deployment_target $macosx_version
     }
 
+    if {![info exists macports::revupgrade_autorun]} {
+        set macports::revupgrade_autorun yes
+    }
     if {![info exists macports::revupgrade_mode]} {
         set macports::revupgrade_mode "rebuild"
     }
@@ -3862,9 +3865,6 @@
 }
 
 proc macports::revupgrade {opts} {
-    if {${macports::revupgrade_mode} == "off"} {
-        return 0
-    }
     set run_loop 1
     array set broken_port_counts {}
     while {$run_loop == 1} {

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2012-01-11 21:58:38 UTC (rev 88793)
+++ trunk/base/src/port/port.tcl	2012-01-11 22:18:56 UTC (rev 88794)
@@ -2594,7 +2594,7 @@
         print_tickets_url
     } else {
         array set options $opts
-        if {![info exists options(ports_upgrade_no-rev-upgrade)]} {
+        if {![info exists options(ports_upgrade_no-rev-upgrade)] && ${macports::revupgrade_autorun}} {
             set status [action_revupgrade $action $portlist $opts]
         }
     }
@@ -3921,7 +3921,7 @@
         print_tickets_url
     } elseif {$action == "install"} {
         array set options $opts
-        if {![info exists options(ports_nodeps)] && ![info exists options(ports_install_no-rev-upgrade)]} {
+        if {![info exists options(ports_nodeps)] && ![info exists options(ports_install_no-rev-upgrade)] && ${macports::revupgrade_autorun}} {
             set status [action_revupgrade $action $portlist $opts]
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120111/88c93f06/attachment.html>