[69106] branches/release_1_9/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 69106
          http://trac.macports.org/changeset/69106
Author:   jmr at macports.org
Date:     2010-06-23 14:31:47 -0700 (Wed, 23 Jun 2010)
Log Message:
-----------
merge r69105 from trunk:
 check for conflicts when running activate target (#25386)

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

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

Modified: branches/release_1_9/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_9/base/src/macports1.0/macports.tcl	2010-06-23 21:29:16 UTC (rev 69105)
+++ branches/release_1_9/base/src/macports1.0/macports.tcl	2010-06-23 21:31:47 UTC (rev 69106)
@@ -2388,7 +2388,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/0f313996/attachment.html>