[19992] trunk/base/src/port/port.tcl

[source_changes at macosforge.org]

Revision: 19992
          http://trac.macosforge.org/projects/macports/changeset/19992
Author:   jberry at macports.org
Date:     2006-10-08 17:46:15 -0700 (Sun, 08 Oct 2006)

Log Message:
-----------
Resolve #10843, and probably #8229.

portinfo was not being initialized each time through the foreachport loop, on a number of targets,
leading to improper output for port deps and port variants, among others.

Modified Paths:
--------------
    trunk/base/src/port/port.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2006-10-08 21:24:35 UTC (rev 19991)
+++ trunk/base/src/port/port.tcl	2006-10-09 00:46:15 UTC (rev 19992)
@@ -444,6 +444,7 @@
 
 	set results {}
 	foreach {name info} $res {
+		array unset portinfo
 		array set portinfo $info
 		
 		#set variants {}
@@ -584,6 +585,7 @@
 				}
 				continue
 			}
+			array unset portinfo
 			array set portinfo [lindex $res 1]
 			
 			# Get information about latest available version and revision
@@ -1148,6 +1150,7 @@
 			if {$found > 1} {
 				ui_warn "Found $found port $portname definitions, displaying first one."
 			}
+			array unset portinfo
 			array set portinfo [lindex $result 1]
 			
 			
@@ -1602,6 +1605,7 @@
 				}
 				continue
 			}
+			array unset portinfo
 			array set portinfo [lindex $res 1]
 			
 			# Get information about latest available version and revision
@@ -1697,6 +1701,7 @@
 			break_softcontinue "No port $portname found." 1 status
 		}
 
+		array unset portinfo
 		array set portinfo [lindex $result 1]
 
 		set depstypes {depends_build depends_lib depends_run}
@@ -1739,6 +1744,7 @@
 			puts "No port $portname found."
 		}
 	
+		array unset portinfo
 		array set portinfo [lindex $result 1]
 	
 		# if this fails the port doesn't have any variants
@@ -1772,6 +1778,7 @@
 			break_softcontinue "search for portname $portname failed: $result" 1 status
 		}
 		foreach {name array} $res {
+			array unset portinfo
 			array set portinfo $array
 
 			# XXX is this the right place to verify an entry?
@@ -1794,7 +1801,6 @@
 			}
 			set portfound 1
 			puts $output
-			unset portinfo
 		}
 		if { !$portfound } {
 			ui_msg "No match for $portname found"
@@ -1827,6 +1833,7 @@
 		}
 
 		foreach {name array} $res {
+			array unset portinfo
 			array set portinfo $array
 			set outdir ""
 			if {[info exists portinfo(portdir)]} {
@@ -1994,6 +2001,7 @@
 			if {[llength $res] < 2} {
 				break_softcontinue "Port $portname not found" 1 status
 			}
+			array unset portinfo
 			array set portinfo [lindex $res 1]
 			set porturl $portinfo(porturl)
 		}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061008/db246ada/attachment.html