[25082] trunk/base
source_changes at macosforge.org
source_changes at macosforge.org
Sun May 13 08:40:27 PDT 2007
Revision: 25082
http://trac.macosforge.org/projects/macports/changeset/25082
Author: jberry at macports.org
Date: 2007-05-13 08:40:27 -0700 (Sun, 13 May 2007)
Log Message:
-----------
Access to macports_user_dir is now through darwinports::macports_user_dir instead of through the autoconf space. We generate the former by calling file normalize on the later at startup.
Modified Paths:
--------------
trunk/base/portmgr/autosubmit.tcl
trunk/base/src/darwinports1.0/darwinports.tcl
trunk/base/src/port/port.tcl
Modified: trunk/base/portmgr/autosubmit.tcl
===================================================================
--- trunk/base/portmgr/autosubmit.tcl 2007-05-13 15:23:44 UTC (rev 25081)
+++ trunk/base/portmgr/autosubmit.tcl 2007-05-13 15:40:27 UTC (rev 25082)
@@ -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: trunk/base/src/darwinports1.0/darwinports.tcl
===================================================================
--- trunk/base/src/darwinports1.0/darwinports.tcl 2007-05-13 15:23:44 UTC (rev 25081)
+++ trunk/base/src/darwinports1.0/darwinports.tcl 2007-05-13 15:40:27 UTC (rev 25082)
@@ -243,7 +243,7 @@
global auto_path env
global darwinports::autoconf::dports_conf_path
- global darwinports::autoconf::macports_user_dir
+ global darwinports::macports_user_dir
global darwinports::bootstrap_options
global darwinports::user_options
global darwinports::extra_env
@@ -268,6 +268,7 @@
global darwinports::xcodeversion
# Ensure that the macports user directory exists
+ set darwinports::macports_user_dir [file normalize $darwinports::autoconf::macports_user_dir]
file mkdir $macports_user_dir
# Configure the search path for configuration files
Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl 2007-05-13 15:23:44 UTC (rev 25081)
+++ trunk/base/src/port/port.tcl 2007-05-13 15:40:27 UTC (rev 25082)
@@ -2434,13 +2434,12 @@
proc process_command_file { in } {
global current_portdir
- global darwinports::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 "${darwinports::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/20070513/30e2f7c3/attachment.html
More information about the macports-changes
mailing list