[78174] trunk/base/src

[jmr at macports.org]

Revision: 78174
          http://trac.macports.org/changeset/78174
Author:   jmr at macports.org
Date:     2011-04-27 07:22:39 -0700 (Wed, 27 Apr 2011)
Log Message:
-----------
set subport in mport_open calls in the portfile context too, and cope with no subport being set in options array in mportdepends

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/package1.0/portmpkg.tcl
    trunk/base/src/port1.0/portsubmit.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2011-04-27 13:09:51 UTC (rev 78173)
+++ trunk/base/src/macports1.0/macports.tcl	2011-04-27 14:22:39 UTC (rev 78174)
@@ -2433,7 +2433,7 @@
         # avoid propagating requested flag from parent
         set optionsarray(ports_requested) 0
         # subport will be different for deps
-        unset optionsarray(subport)
+        unset -nocomplain optionsarray(subport)
         set options [array get optionsarray]
         set variations [ditem_key $mport variations]
         set required_archs [$workername eval get_canonical_archs]

Modified: trunk/base/src/package1.0/portmpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portmpkg.tcl	2011-04-27 13:09:51 UTC (rev 78173)
+++ trunk/base/src/package1.0/portmpkg.tcl	2011-04-27 14:22:39 UTC (rev 78174)
@@ -103,7 +103,7 @@
 		if {[info exists portinfo(porturl)] && [info exists portinfo(version)] && $portinfo(version) == $portversion} {
 			# only the prefix gets passed to the worker.
 			ui_debug "building dependency package: $portname"
-			set worker [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${destination} package.flat ${package.flat}] [array get variations] yes]
+			set worker [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${destination} package.flat ${package.flat} subport $portinfo(name)] [array get variations] yes]
 			mport_exec $worker pkg
 			mport_close $worker
 		}

Modified: trunk/base/src/port1.0/portsubmit.tcl
===================================================================
--- trunk/base/src/port1.0/portsubmit.tcl	2011-04-27 13:09:51 UTC (rev 78173)
+++ trunk/base/src/port1.0/portsubmit.tcl	2011-04-27 14:22:39 UTC (rev 78174)
@@ -232,9 +232,9 @@
         set tmpdir [mktemp "/tmp/mports.XXXXXXXX"]
         file mkdir $tmpdir/new
         file mkdir $tmpdir/old
-        set worker [mport_open $portsource/files/$name/$version/$result(revision)/Portfile.tar.gz [list portdir $tmpdir/new]]
+        set worker [mport_open $portsource/files/$name/$version/$result(revision)/Portfile.tar.gz [list portdir $tmpdir/new subport $name]]
         if {$base_rev != ""} {
-            set worker2 [mport_open $portsource/files/$name/$version/$base_rev/Portfile.tar.gz [list portdir $tmpdir/old]]
+            set worker2 [mport_open $portsource/files/$name/$version/$base_rev/Portfile.tar.gz [list portdir $tmpdir/old subport $name]]
             catch {system "diff3 -m -E -- $portpath/Portfile $tmpdir/old/$name-$version/Portfile $tmpdir/new/$name-$version/Portfile > $tmpdir/Portfile"}
             file rename -force "${tmpdir}/Portfile" "${portpath}/Portfile"
             mport_close $worker2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110427/d30ec40c/attachment.html>