[66691] trunk/base/src/registry2.0/portimage.tcl

[jmr at macports.org]

Revision: 66691
          http://trac.macports.org/changeset/66691
Author:   jmr at macports.org
Date:     2010-04-20 07:26:45 -0700 (Tue, 20 Apr 2010)
Log Message:
-----------
detect conflicting symlinks when activating

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

Modified: trunk/base/src/registry2.0/portimage.tcl
===================================================================
--- trunk/base/src/registry2.0/portimage.tcl	2010-04-20 14:26:28 UTC (rev 66690)
+++ trunk/base/src/registry2.0/portimage.tcl	2010-04-20 14:26:45 UTC (rev 66691)
@@ -483,7 +483,7 @@
                             # the registry
                             if { $owner != {} && $owner != $port } {
                                 throw registry::image-error "Image error: $file is being used by the active [$owner name] port.  Please deactivate this port first, or use 'port -f activate [$port name]' to force the activation."
-                            } elseif { $owner == {} && [file exists $file] } {
+                            } elseif { $owner == {} && ![catch {[file type $file]}] } {
                                 throw registry::image-error "Image error: $file already exists and does not belong to a registered port.  Unable to activate port [$port name]. Use 'port -f activate [$port name]' to force the activation."
                             }
                         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100420/9735f1d7/attachment.html>