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

[jmr at macports.org]

Revision: 59669
          http://trac.macports.org/changeset/59669
Author:   jmr at macports.org
Date:     2009-10-19 08:09:16 -0700 (Mon, 19 Oct 2009)
Log Message:
-----------
only calculate timestamp once when force activating (r49006 was meant to do this but didn't)

Revision Links:
--------------
    http://trac.macports.org/changeset/49006

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-10-19 14:54:17 UTC (rev 59668)
+++ trunk/base/src/registry1.0/portimage.tcl	2009-10-19 15:09:16 UTC (rev 59669)
@@ -292,6 +292,7 @@
 	global macports::prefix
 
 	set files [list]
+	set timestamp [clock seconds]
 	
 	# This is big and hairy and probably could be done better.
 	# First, we need to check the source file, make sure it exists
@@ -310,10 +311,8 @@
 			return -code error "Image error: Source file $srcfile does not appear to exist (cannot lstat it).  Unable to activate port $name."
 		}
 
-		set port [registry::file_registered $file] 
+		set port [registry::file_registered $file]
 
-		set timestamp [clock seconds]
-
 		if { $port != 0  && $force != 1 && $port != $name } {
 			return -code error "Image error: $file is being used by the active $port port.  Please deactivate this port first, or use 'port -f activate $name' to force the activation."
 		} elseif { [file exists $file] && $force != 1 } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091019/bb8287b0/attachment.html>