[69680] branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl

and.damore at macports.org and.damore at macports.org
Tue Jul 13 07:21:00 PDT 2010


Revision: 69680
          http://trac.macports.org/changeset/69680
Author:   and.damore at macports.org
Date:     2010-07-13 07:20:58 -0700 (Tue, 13 Jul 2010)
Log Message:
-----------
added comment for placeholding

Modified Paths:
--------------
    branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl

Modified: branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl
===================================================================
--- branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl	2010-07-13 14:06:29 UTC (rev 69679)
+++ branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl	2010-07-13 14:20:58 UTC (rev 69680)
@@ -449,12 +449,15 @@
                     }
 
                     set owner [registry::entry owner $file]
+                    ui_msg "GSOC: $file owner is \"$owner\""
 
                     if {$owner != {} && $owner != $port} {
                         # deactivate conflicting port if it is replaced_by this one
                         set result [mportlookup [$owner name]]
                         array unset portinfo
                         array set portinfo [lindex $result 1]
+                        #GSoC10
+                        #here we'll check if you should replace a config file testing a --drop-config option from CLI
                         if {[info exists portinfo(replaced_by)] && [lsearch -regexp $portinfo(replaced_by) "(?i)^[$port name]\$"] != -1} {
                             # we'll deactivate the owner later, but before activating our files
                             set todeactivate($owner) yes
@@ -522,7 +525,7 @@
             # debug output of activate make more sense.
             set theList [lsort -increasing -unique $files]
             set rollback_filelist {}
-
+            ui_msg "GSOC DBG: let's activate actual files"
             registry::write {
                 # Activate it, and catch errors so we can roll-back
                 try {
@@ -539,6 +542,7 @@
                 }
             }
         } catch {*} {
+            ui_msg "GSOC DBG: rollback"
             # roll back activation of this port
             if {[info exists deactivate_this]} {
                 _deactivate_contents $port $rollback_filelist yes yes
@@ -664,6 +668,7 @@
             return -code error $result
         }
     }
+    ui_msg "GSOC DBG: end of _activate_contents"
 }
 
 proc _deactivate_file {dstfile} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100713/4416ec3d/attachment.html>


More information about the macports-changes mailing list