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

[jmr at macports.org]

Revision: 141412
          https://trac.macports.org/changeset/141412
Author:   jmr at macports.org
Date:     2015-10-17 15:07:51 -0700 (Sat, 17 Oct 2015)
Log Message:
-----------
print message in _mporterrorifconflictsinstalled rather than relying on the caller to print the error (#49334)

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2015-10-17 20:19:05 UTC (rev 141411)
+++ trunk/base/src/macports1.0/macports.tcl	2015-10-17 22:07:51 UTC (rev 141412)
@@ -1950,7 +1950,8 @@
             if {![macports::ui_isset ports_debug]} {
                 ui_msg {}
             }
-            return -code error "Can't install $portinfo(name) because conflicting ports are active: $conflictlist"
+            ui_error "Can't install $portinfo(name) because conflicting ports are active: $conflictlist"
+            return -code error "conflicting ports"
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/67b3897a/attachment.html>