[69105] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 69105
          http://trac.macports.org/changeset/69105
Author:   jmr at macports.org
Date:     2010-06-23 14:29:16 -0700 (Wed, 23 Jun 2010)
Log Message:
-----------
check for conflicts when running activate target (#25386)

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-06-23 21:13:54 UTC (rev 69104)
+++ trunk/base/src/macports1.0/macports.tcl	2010-06-23 21:29:16 UTC (rev 69105)
@@ -2423,7 +2423,7 @@
         flush stdout
     }
     
-    if {[info exists portinfo(conflicts)] && ($target == "" || $target == "install")} {
+    if {[info exists portinfo(conflicts)] && ($target == "" || $target == "install" || $target == "activate")} {
         set conflictports [_mportconflictsinstalled $mport $portinfo(conflicts)]
         if {[llength ${conflictports}] != 0} {
             if {[macports::global_option_isset ports_force]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100623/2833aa9e/attachment.html>