[51657] branches/images-and-archives/base/src/registry1.0/registry.tcl

[blb at macports.org]

Revision: 51657
          http://trac.macports.org/changeset/51657
Author:   blb at macports.org
Date:     2009-05-30 00:23:41 -0700 (Sat, 30 May 2009)
Log Message:
-----------
Remove old comment, some unneeded file_map calls, and make sure to close the file_map during deactivate

Modified Paths:
--------------
    branches/images-and-archives/base/src/registry1.0/registry.tcl

Modified: branches/images-and-archives/base/src/registry1.0/registry.tcl
===================================================================
--- branches/images-and-archives/base/src/registry1.0/registry.tcl	2009-05-30 07:02:19 UTC (rev 51656)
+++ branches/images-and-archives/base/src/registry1.0/registry.tcl	2009-05-30 07:23:41 UTC (rev 51657)
@@ -495,14 +495,11 @@
 		if {[catch {system "$bzipcmd -dc files.tar.bz2 | $tarcmd -xpvf -"} err]} {
 			throw MACPORTS $err
 		}
-		# XXX should we delete files.tar.bz2 now here?
 		_activate_contents $name $imagefiles $extractdir
 		registry::property_store $ref active 1
 		registry::write_entry $ref
 
-		registry::open_file_map
 		registry::register_bulk_files $contents $name
-		registry::write_file_map
 	} catch {* errorCode errorMessage} {
 		ui_error $errorMessage
 	} finally {
@@ -560,6 +557,7 @@
 		registry::unregister_file $file
 	}
 	registry::write_file_map
+	registry::close_file_map
 	
 	registry::property_store $ref active 0
 
@@ -642,7 +640,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 ${extractdir}${file}
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090530/6a65ba2b/attachment.html>