[47864] branches/release_1_7/base

[raimue at macports.org]

Revision: 47864
          http://trac.macports.org/changeset/47864
Author:   raimue at macports.org
Date:     2009-03-08 15:56:04 -0700 (Sun, 08 Mar 2009)
Log Message:
-----------
Merge r47848 from trunk:
Improve message given when conflicting files are found during activation.

See #12989.

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

Property Changed:
----------------
    branches/release_1_7/base/


Property changes on: branches/release_1_7/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,46983,47034,47776,47782
/trunk/base/base:45161
   + /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,46983,47034,47776,47782,47848
/trunk/base/base:45161

Modified: branches/release_1_7/base/src/registry1.0/portimage.tcl
===================================================================
--- branches/release_1_7/base/src/registry1.0/portimage.tcl	2009-03-08 22:15:12 UTC (rev 47863)
+++ branches/release_1_7/base/src/registry1.0/portimage.tcl	2009-03-08 22:56:04 UTC (rev 47864)
@@ -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/197b7eb4/attachment.html>