[99115] trunk/dports/_resources/port1.0/group/conflicts_build-1.0.tcl

[ryandesign at macports.org]

Revision: 99115
          http://trac.macports.org//changeset/99115
Author:   ryandesign at macports.org
Date:     2012-10-26 23:02:38 -0700 (Fri, 26 Oct 2012)
Log Message:
-----------
conflicts_build-1.0.tcl: support subports; add custom message when the port a port conflicts with is itself (i.e. petsc)

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/conflicts_build-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/conflicts_build-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/conflicts_build-1.0.tcl	2012-10-27 05:47:44 UTC (rev 99114)
+++ trunk/dports/_resources/port1.0/group/conflicts_build-1.0.tcl	2012-10-27 06:02:38 UTC (rev 99115)
@@ -47,12 +47,17 @@
 
 
 proc conflicts_build._check_for_conflicting_ports {} {
-    global conflicts_build name
+    global conflicts_build subport
     foreach badport ${conflicts_build} {
         if {![catch "registry_active ${badport}"]} {
-            ui_error "${name} cannot be built while ${badport} is active."
-            ui_error "Please deactivate ${badport} and try again."
-            ui_error "You can reactivate ${badport} again later."
+            if {${subport} == ${badport}} {
+                ui_error "${subport} cannot be built while another version of ${badport} is active."
+                ui_error "Please deactivate the existing copy of ${badport} and try again."
+            } else {
+                ui_error "${subport} cannot be built while ${badport} is active."
+                ui_error "Please deactivate ${badport} and try again."
+                ui_error "You can reactivate ${badport} again later."
+            }
             return -code error "${badport} is active"
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121026/97ac7ca0/attachment.html>