[51407] trunk/base/src/registry1.0/portimage.tcl

[jmr at macports.org]

Revision: 51407
          http://trac.macports.org/changeset/51407
Author:   jmr at macports.org
Date:     2009-05-23 22:25:38 -0700 (Sat, 23 May 2009)
Log Message:
-----------
avoid an extra filemap open/close in portimage::activate

Modified Paths:
--------------
    trunk/base/src/registry1.0/portimage.tcl

Modified: trunk/base/src/registry1.0/portimage.tcl
===================================================================
--- trunk/base/src/registry1.0/portimage.tcl	2009-05-24 05:13:16 UTC (rev 51406)
+++ trunk/base/src/registry1.0/portimage.tcl	2009-05-24 05:25:38 UTC (rev 51407)
@@ -124,13 +124,13 @@
 	
 	set imagefiles [_check_contents $name $contents $imagedir]
 	
+	registry::open_file_map
 	_activate_contents $name $imagefiles $imagedir
 
 	registry::property_store $ref active 1
 
 	registry::write_entry $ref
 
-	registry::open_file_map
 	foreach file $imagefiles {
 		registry::register_file $file $name
 	}
@@ -330,7 +330,6 @@
 	# Last, if the file exists, and belongs to another port, and force is set
 	#  we remove the file from the file_map, take ownership of it, and 
 	#  clobber it
-	registry::open_file_map
 	foreach file $imagefiles {
 		set srcfile ${imagedir}${file}
 
@@ -382,7 +381,6 @@
 		lappend files $file
 	}
 	registry::write_file_map
-	registry::close_file_map
 
 	# Sort the list in forward order, removing duplicates.
 	# Since the list is sorted in forward order, we're sure that directories
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090523/b8ef6d5f/attachment.html>