[24849] trunk/base/src/port1.0

[source_changes at macosforge.org]

Revision: 24849
          http://trac.macosforge.org/projects/macports/changeset/24849
Author:   jberry at macports.org
Date:     2007-05-06 08:03:31 -0700 (Sun, 06 May 2007)

Log Message:
-----------
When searching for cmds in prefix, use new prefix_frozen so that the search will succeed even for portfiles that redine prefix

Modified Paths:
--------------
    trunk/base/src/port1.0/portfetch.tcl
    trunk/base/src/port1.0/portsubmit.tcl

Modified: trunk/base/src/port1.0/portfetch.tcl
===================================================================
--- trunk/base/src/port1.0/portfetch.tcl	2007-05-06 15:02:14 UTC (rev 24848)
+++ trunk/base/src/port1.0/portfetch.tcl	2007-05-06 15:03:31 UTC (rev 24849)
@@ -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: trunk/base/src/port1.0/portsubmit.tcl
===================================================================
--- trunk/base/src/port1.0/portsubmit.tcl	2007-05-06 15:02:14 UTC (rev 24848)
+++ trunk/base/src/port1.0/portsubmit.tcl	2007-05-06 15:03:31 UTC (rev 24849)
@@ -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;
@@ -182,8 +182,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/1c17ecd9/attachment.html