[70638] branches/gsoc10-configfiles/base/src

[and.damore at macports.org]

Revision: 70638
          http://trac.macports.org/changeset/70638
Author:   and.damore at macports.org
Date:     2010-08-15 14:44:50 -0700 (Sun, 15 Aug 2010)
Log Message:
-----------
added --config-upgrade to upgrade action options, added entry to port-help, put placeholder in macports::upgrade

Modified Paths:
--------------
    branches/gsoc10-configfiles/base/src/macports1.0/macports.tcl
    branches/gsoc10-configfiles/base/src/port/port-help.tcl
    branches/gsoc10-configfiles/base/src/port/port.tcl

Modified: branches/gsoc10-configfiles/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc10-configfiles/base/src/macports1.0/macports.tcl	2010-08-15 21:05:43 UTC (rev 70637)
+++ branches/gsoc10-configfiles/base/src/macports1.0/macports.tcl	2010-08-15 21:44:50 UTC (rev 70638)
@@ -2831,6 +2831,8 @@
 # upgrade API wrapper procedure
 # return codes: 0 = success, 1 = general failure, 2 = port name not found in index
 proc macports::upgrade {portname dspec variationslist optionslist {depscachename ""}} {
+    array set options $optionslist
+    
     # only installed ports can be upgraded
     if {![registry::entry_exists_for_name $portname]} {
         ui_error "$portname is not installed"
@@ -2848,6 +2850,11 @@
         set orig_nodeps no
     }
     
+    if {[info exists options(ports_upgrade_config-upgrade)] && $options(ports_upgrade_config-upgrade) eq "yes"} {
+        puts "GSOCDBG:\tport upgrade --config-upgrade | just exiting quietly (for now)"
+        return 0
+    }
+    
     # run the actual upgrade
     set status [macports::_upgrade $portname $dspec $variationslist $optionslist depscache]
     

Modified: branches/gsoc10-configfiles/base/src/port/port-help.tcl
===================================================================
--- branches/gsoc10-configfiles/base/src/port/port-help.tcl	2010-08-15 21:05:43 UTC (rev 70637)
+++ branches/gsoc10-configfiles/base/src/port/port-help.tcl	2010-08-15 21:44:50 UTC (rev 70638)
@@ -339,6 +339,7 @@
                     upgrade even if the port is not outdated.
 --no-replace        Do not replace one port with another according to the
                     replaced_by field
+--config-upgrade    Handles changes in config files during upgrade
 }
 
 set porthelp(url) {

Modified: branches/gsoc10-configfiles/base/src/port/port.tcl
===================================================================
--- branches/gsoc10-configfiles/base/src/port/port.tcl	2010-08-15 21:05:43 UTC (rev 70637)
+++ branches/gsoc10-configfiles/base/src/port/port.tcl	2010-08-15 21:44:50 UTC (rev 70638)
@@ -3870,7 +3870,7 @@
     lint        {nitpick}
     select      {list set show}
     log         {{phase 1} {level 1}}
-    upgrade     {force enforce-variants no-replace}
+    upgrade     {force enforce-variants no-replace config-upgrade}
 }
 
 ##
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100815/e20f2e7b/attachment.html>