[47848] trunk/base/src/registry1.0/portimage.tcl
jmr at macports.org
jmr at macports.org
Sun Mar 8 01:16:21 PST 2009
Revision: 47848
http://trac.macports.org/changeset/47848
Author: jmr at macports.org
Date: 2009-03-08 01:16:18 -0800 (Sun, 08 Mar 2009)
Log Message:
-----------
Improve message given when conflicting files are found during activation.
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-03-08 07:52:17 UTC (rev 47847)
+++ trunk/base/src/registry1.0/portimage.tcl 2009-03-08 09:16:18 UTC (rev 47848)
@@ -342,7 +342,7 @@
set port [registry::file_registered $file]
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 the -f flag to force the activation."
+ 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 } {
return -code error "Image error: $file already exists and does not belong to a registered port. Unable to activate port $name."
} elseif { $force == 1 && [file exists $file] || $port != 0 } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090308/6f910f6d/attachment.html>
More information about the macports-changes
mailing list