Modified: branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl (70397 => 70398)

--- branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl	2010-08-08 07:24:38 UTC (rev 70397)
+++ branches/gsoc10-configfiles/base/src/registry2.0/portimage.tcl	2010-08-08 08:10:03 UTC (rev 70398)
@@ -699,8 +699,7 @@
     variable use_reg2
     set files [list]
 
-    foreach file $imagefiles {
-        #GSOC10 we should avoid adding file to $files and instead handle them putting into a separate registry table  
+    foreach file $imagefiles {  
         if { [file exists $file] || (![catch {file type $file}] && [file type $file] == "link") } {
             # Normalize the file path to avoid removing the intermediate
             # symlinks (remove the empty directories instead)
@@ -737,8 +736,8 @@
             $port deactivate $imagefiles
             foreach file $files {
                   if {[is_config_file $file]} {
-                          puts "GSOC: $file is config file, skipping for now"
-                          continue
+                          #puts "GSOC: $file is config file, skipping for now"
+                          #continue
                       }                  
                 _deactivate_file $file
             }
@@ -750,15 +749,6 @@
     }
 }
 
-#proc gsocdebug {command-string op} {puts "GSOCDBG: ${command-string}" }
-#trace add execution ::portimage::_check_registry enter gsocdebug
-#trace add execution ::portimage::_check_contents enter gsocdebug
-#trace add execution ::portimage::_activate_file enter gsocdebug
-#trace add execution ::portimage::_activate_contents enter gsocdebug
-#trace add execution ::portimage::_deactivate_file enter gsocdebug
-#trace add execution ::portimage::_deactivate_contents enter gsocdebug
-
-
 proc is_config_file {filename} {
     #replace hardcoded path with $config_path from portmain.tcl, what namespace does "option" add options to?
     if {[string match ${::macports::prefix} "$filename"]} {return 1} {return 0}