[68951] branches/release_1_9/base/src/port/port.tcl

jmr at macports.org jmr at macports.org
Fri Jun 18 09:17:17 PDT 2010


Revision: 68951
          http://trac.macports.org/changeset/68951
Author:   jmr at macports.org
Date:     2010-06-18 09:17:16 -0700 (Fri, 18 Jun 2010)
Log Message:
-----------
merge r68950 from trunk:
 restore handling of multiple ports in deps action, and make its formatting more like 1.8 (#25324)

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

Modified Paths:
--------------
    branches/release_1_9/base/src/port/port.tcl

Modified: branches/release_1_9/base/src/port/port.tcl
===================================================================
--- branches/release_1_9/base/src/port/port.tcl	2010-06-18 16:15:21 UTC (rev 68950)
+++ branches/release_1_9/base/src/port/port.tcl	2010-06-18 16:17:16 UTC (rev 68951)
@@ -2585,6 +2585,7 @@
     if {[require_portlist portlist]} {
         return 1
     }
+    set separator ""
 
     foreachport $portlist {
         if {[info exists options(ports_${action}_no-build)] && [string is true -strict $options(ports_${action}_no-build)]} {
@@ -2651,6 +2652,7 @@
         set portname $portinfo(name)
 
         set deplist {}
+        set deps_output {}
         set ndeps 0
         array set labeldict {depends_fetch Fetch depends_extract Extract depends_build Build depends_lib Library depends_run Runtime}
         # get list of direct deps
@@ -2667,7 +2669,7 @@
                 }
                 if {$action == "deps"} {
                     set label "$labeldict($type) Dependencies"
-                    puts [wraplabel $label [join $deplist ", "] 0 [string repeat " " 22]]
+                    lappend deps_output [wraplabel $label [join $deplist ", "] 0 [string repeat " " 22]]
                     incr ndeps [llength $deplist]
                     set deplist {}
                 }
@@ -2682,11 +2684,16 @@
             set variants {}
         }
 
+        puts -nonewline $separator
         if {$action == "deps"} {
             if {$ndeps == 0} {
                 ui_notice "$portname @${version}_${revision}${variants} has no dependencies."
+            } else {
+                ui_notice "Full Name: $portname @${version}_${revision}${variants}"
+                puts [join $deps_output "\n"]
             }
-            return $status
+            set separator "--\n"
+            continue
         }
 
         set toplist $deplist
@@ -2781,6 +2788,7 @@
             incr cur_pos
             set pos_stack [lreplace $pos_stack end end $cur_pos]
         }
+        set separator "--\n"
     }
     return $status
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100618/6bb469be/attachment.html>


More information about the macports-changes mailing list