[25430] branches/dp2mp-move/base

[source_changes at macosforge.org]

Revision: 25430
          http://trac.macosforge.org/projects/macports/changeset/25430
Author:   jmpp at macports.org
Date:     2007-05-21 22:10:38 -0700 (Mon, 21 May 2007)

Log Message:
-----------

Merging jberry's r25082: Access to macports_user_dir is now through darwinports::macports_user_dir (...).

Modified Paths:
--------------
    branches/dp2mp-move/base/portmgr/autosubmit.tcl
    branches/dp2mp-move/base/src/macports1.0/macports.tcl
    branches/dp2mp-move/base/src/port/port.tcl

Modified: branches/dp2mp-move/base/portmgr/autosubmit.tcl
===================================================================
--- branches/dp2mp-move/base/portmgr/autosubmit.tcl	2007-05-22 01:40:35 UTC (rev 25429)
+++ branches/dp2mp-move/base/portmgr/autosubmit.tcl	2007-05-22 05:10:38 UTC (rev 25430)
@@ -132,8 +132,7 @@
 set SUBMITTER_EMAIL "autosubmit at macports.org"
 array set submit_options "submitter_name $SUBMITTER_NAME submitter_email $SUBMITTER_EMAIL"
 
-global darwinports::autoconf::macports_user_dir
-set db_file [file normalize "${darwinports::autoconf::macports_user_dir}/autosubmit.db"]
+set db_file [file normalize "${darwinports::macports_user_dir}/autosubmit.db"]
 
 # Do argument processing
 set verbose 0

Modified: branches/dp2mp-move/base/src/macports1.0/macports.tcl
===================================================================
--- branches/dp2mp-move/base/src/macports1.0/macports.tcl	2007-05-22 01:40:35 UTC (rev 25429)
+++ branches/dp2mp-move/base/src/macports1.0/macports.tcl	2007-05-22 05:10:38 UTC (rev 25430)
@@ -255,7 +255,7 @@
 	
 	global auto_path env
 	global macports::autoconf::macports_conf_path
-        global macports::autoconf::macports_user_dir
+        global macports::macports_user_dir
 	global macports::bootstrap_options
 	global macports::user_options
 	global macports::extra_env
@@ -280,6 +280,7 @@
    	global macports::xcodeversion
 
         # Ensure that the macports user directory exists
+        set macports::macports_user_dir [file normalize $macports::autoconf::macports_user_dir]
         file mkdir $macports_user_dir
    	
    	# Configure the search path for configuration files

Modified: branches/dp2mp-move/base/src/port/port.tcl
===================================================================
--- branches/dp2mp-move/base/src/port/port.tcl	2007-05-22 01:40:35 UTC (rev 25429)
+++ branches/dp2mp-move/base/src/port/port.tcl	2007-05-22 05:10:38 UTC (rev 25430)
@@ -2434,13 +2434,12 @@
 
 proc process_command_file { in } {
 	global current_portdir
-	global macports::autoconf::macports_user_dir
 
 	# Initialize readline
 	set isstdin [string match $in "stdin"]
 	set name "port"
 	set use_readline [expr $isstdin && [readline init $name]]
-	set history_file [file normalize "${macports_user_dir}/history"]
+	set history_file [file normalize "${macports::macports_user_dir}/history"]
 
 	# Read readline history
 	if {$use_readline} {

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