[151083] contrib/mp-buildbot/tools/dependencies.tcl

[cal at macports.org]

Revision: 151083
          https://trac.macports.org/changeset/151083
Author:   cal at macports.org
Date:     2016-08-06 11:02:44 -0700 (Sat, 06 Aug 2016)
Log Message:
-----------
mp-buildbot: Print dependencies in topologic order

foreach ditem $dlist {...} does not print items in topologic sorting, but we
need that to ensure that we always know exactly which port failed to install in
mpbb install-dependencies. Fix this by using dlist_eval, which is guaranteed to
sort accordingly.

Modified Paths:
--------------
    contrib/mp-buildbot/tools/dependencies.tcl

Modified: contrib/mp-buildbot/tools/dependencies.tcl
===================================================================
--- contrib/mp-buildbot/tools/dependencies.tcl	2016-08-06 16:55:05 UTC (rev 151082)
+++ contrib/mp-buildbot/tools/dependencies.tcl	2016-08-06 18:02:44 UTC (rev 151083)
@@ -81,15 +81,15 @@
 dlist_delete dlist $mport
 
 ## print dependencies with variants
-foreach ditem $dlist {
-    set depname [ditem_key $ditem provides]
+proc printdependency {ditem} {
     array set depinfo [mportinfo $ditem]
 
-    puts [string trim "$depname $depinfo(canonical_active_variants)"]
+    puts [string trim "$depinfo(name) $depinfo(canonical_active_variants)"]
 }
+dlist_eval $dlist {} [list printdependency]
 
 # close all open ports
-foreach ditem $dlist {
+foreach ditem $macports::open_mports {
     #try -pass_signal {...}
     try {
         mportclose $ditem
@@ -97,13 +97,6 @@
         ui_warn "mportclose [ditem_key $ditem provides] failed: $eMessage"
     }
 }
-#try -pass_signal {...}
-try {
-    mportclose $mport
-} catch {{*} eCode eMessage} {
-    ui_error "mportclose $portname failed: $eMessage"
-    exit 1
-}
 
 # shut down MacPorts
 #try -pass_signal {...}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160806/d72f0a07/attachment-0001.html>