[24881] branches/dp2mp-move/base/src

[source_changes at macosforge.org]

Revision: 24881
          http://trac.macosforge.org/projects/macports/changeset/24881
Author:   jmpp at macports.org
Date:     2007-05-06 23:11:21 -0700 (Sun, 06 May 2007)

Log Message:
-----------
Merging jberry's r24848 ^ r24

Modified Paths:
--------------
    branches/dp2mp-move/base/src/macports1.0/macports.tcl
    branches/dp2mp-move/base/src/port1.0/portfetch.tcl
    branches/dp2mp-move/base/src/port1.0/portsubmit.tcl

Modified: branches/dp2mp-move/base/src/macports1.0/macports.tcl
===================================================================
--- branches/dp2mp-move/base/src/macports1.0/macports.tcl	2007-05-07 06:03:53 UTC (rev 24880)
+++ branches/dp2mp-move/base/src/macports1.0/macports.tcl	2007-05-07 06:11:21 UTC (rev 24881)
@@ -38,7 +38,7 @@
 namespace eval macports {
     namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities
     variable bootstrap_options "\
-    	portdbpath libpath binpath auto_path extra_env sources_conf prefix portdbformat \
+    	portdbpath libpath binpath auto_path extra_env sources_conf prefix prefix_frozen portdbformat \
     	portinstalltype portarchivemode portarchivepath portarchivetype portautoclean \
     	porttrace portverbose destroot_umask variants_conf rsync_server rsync_options \
     	rsync_dir startupitem_type xcodeversion xcodebuildcmd \
@@ -258,6 +258,7 @@
    	global macports::destroot_umask
    	global macports::libpath
    	global macports::prefix
+        global macports::prefix_frozen
    	global macports::registry.installtype
    	global macports::rsync_dir
    	global macports::rsync_options
@@ -419,6 +420,10 @@
 		}
 	}
 
+        # Duplicate prefix into prefix_frozen, so that port actions
+        # can always get to the original prefix, even if a portfile overrides prefix
+        set macports::prefix_frozen $prefix
+
 	# Export verbosity.
 	if {![info exists portverbose]} {
 		set macports::portverbose "no"

Modified: branches/dp2mp-move/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/portfetch.tcl	2007-05-07 06:03:53 UTC (rev 24880)
+++ branches/dp2mp-move/base/src/port1.0/portfetch.tcl	2007-05-07 06:11:21 UTC (rev 24881)
@@ -353,12 +353,12 @@
 
 # Perform an svn fetch
 proc svnfetch {args} {
-    global workpath prefix
+    global workpath prefix_frozen
     global svn.env svn.cmd svn.args svn.post_args svn.tag svn.url
     
     # Look for the svn command, either in the path or in the prefix
     set goodcmd 0
-    foreach svncmd "${svn.cmd} ${prefix}/bin/svn svn" {
+    foreach svncmd "${svn.cmd} ${prefix_frozen}/bin/svn svn" {
  	if { [file executable ${svncmd}] } {
  	   	  set svn.cmd $svncmd
  	   	  set goodcmd 1

Modified: branches/dp2mp-move/base/src/port1.0/portsubmit.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/portsubmit.tcl	2007-05-07 06:03:53 UTC (rev 24880)
+++ branches/dp2mp-move/base/src/port1.0/portsubmit.tcl	2007-05-07 06:11:21 UTC (rev 24881)
@@ -42,9 +42,9 @@
 
 
 proc xar_path {args} {
-	global prefix 
+	global prefix_frozen
     set xar ""
-    foreach path "${portutil::autoconf::xar_path} ${prefix}/bin/xar xar" {
+    foreach path "${portutil::autoconf::xar_path} ${prefix_frozen}/bin/xar xar" {
  	if { [file executable ${path}] } {
  	   	  set xar $path
  	      break;
@@ -186,8 +186,7 @@
    	# Create portpkg.xar in the work directory
    	set pkgpath [create_portpkg]
    	
-   	# If a private key was provided, create a signed digest of the submission
-   	# TODO
+   	# TODO: If a private key was provided, create a signed digest of the submission
    	
    	# Submit to the submit url
     set args "curl"

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