[24877] branches/dp2mp-move/base/src/macports1.0

[source_changes at macosforge.org]

Revision: 24877
          http://trac.macosforge.org/projects/macports/changeset/24877
Author:   jmpp at macports.org
Date:     2007-05-06 22:52:46 -0700 (Sun, 06 May 2007)

Log Message:
-----------
s/mports_conf_path/macports_conf_path/g to match the naming in the new macports_user_dir variable.

Modified Paths:
--------------
    branches/dp2mp-move/base/src/macports1.0/macports.tcl
    branches/dp2mp-move/base/src/macports1.0/macports_autoconf.tcl.in
    branches/dp2mp-move/base/src/macports1.0/session.c

Modified: branches/dp2mp-move/base/src/macports1.0/macports.tcl
===================================================================
--- branches/dp2mp-move/base/src/macports1.0/macports.tcl	2007-05-07 05:47:08 UTC (rev 24876)
+++ branches/dp2mp-move/base/src/macports1.0/macports.tcl	2007-05-07 05:52:46 UTC (rev 24877)
@@ -242,7 +242,7 @@
 	}
 	
 	global auto_path env
-	global macports::autoconf::mports_conf_path
+	global macports::autoconf::macports_conf_path
         global macports::autoconf::macports_user_dir
 	global macports::bootstrap_options
 	global macports::user_options
@@ -275,7 +275,7 @@
 		set PORTSRC [lindex [array get env PORTSRC] 1]
 		lappend conf_files ${PORTSRC}
     }
-    lappend conf_files "${macports_user_dir}/macports.conf" "${mports_conf_path}/macports.conf"
+    lappend conf_files "${macports_user_dir}/macports.conf" "${macports_conf_path}/macports.conf"
     
     # Process the first configuration file we find on conf_files list
 	foreach file $conf_files {
@@ -310,7 +310,7 @@
 	}
 	
     if {![info exists sources_conf]} {
-        return -code error "sources_conf must be set in $mports_conf_path/macports.conf or in your ${macports_user_dir}/macports.conf file"
+        return -code error "sources_conf must be set in ${macports_conf_path}/macports.conf or in your ${macports_user_dir}/macports.conf file"
     }
     if {[catch {set fd [open $sources_conf r]} result]} {
         return -code error "$result"
@@ -354,7 +354,7 @@
 	}
 
     if {![info exists portdbpath]} {
-	return -code error "portdbpath must be set in $mports_conf_path/macports.conf or in your ~/.macports/macports.conf"
+	return -code error "portdbpath must be set in ${macports_conf_path}/macports.conf or in your ~/.macports/macports.conf"
     }
     if {![file isdirectory $portdbpath]} {
 	if {![file exists $portdbpath]} {
@@ -1459,7 +1459,7 @@
 	ui_debug "Setting user: $user"
 
 	# get MacPorts version 
-	set mp_version_path [file join $mports_conf_path mp_version]
+    set mp_version_path [file join ${macports_conf_path} mp_version]
 	if { [file exists $mp_version_path]} {
 		set fd [open $mp_version_path r]
 		gets $fd mp_version_old
@@ -1533,9 +1533,9 @@
 
 proc macports::version {} {
 	global macports::rsync_server macports::rsync_dir
-        global macports::autoconf::mports_conf_path
+        global macports::autoconf::macports_conf_path
 	
-	set mp_version_path [file join $mports_conf_path mp_version]
+    set mp_version_path [file join ${macports_conf_path} mp_version]
 
 	if [file exists $mp_version_path] {
 		set fd [open $mp_version_path r]

Modified: branches/dp2mp-move/base/src/macports1.0/macports_autoconf.tcl.in
===================================================================
--- branches/dp2mp-move/base/src/macports1.0/macports_autoconf.tcl.in	2007-05-07 05:47:08 UTC (rev 24876)
+++ branches/dp2mp-move/base/src/macports1.0/macports_autoconf.tcl.in	2007-05-07 05:52:46 UTC (rev 24877)
@@ -31,7 +31,7 @@
 package provide macports 1.0
 
 namespace eval macports::autoconf {
-	variable mports_conf_path "@MPCONFIGDIR_EXPANDED@"
+	variable macports_conf_path "@MPCONFIGDIR_EXPANDED@"
         variable macports_user_dir "~/.macports"
         variable svn_path "@SVN@"
 	variable rsync_path "@RSYNC@"

Modified: branches/dp2mp-move/base/src/macports1.0/session.c
===================================================================
--- branches/dp2mp-move/base/src/macports1.0/session.c	2007-05-07 05:47:08 UTC (rev 24876)
+++ branches/dp2mp-move/base/src/macports1.0/session.c	2007-05-07 05:52:46 UTC (rev 24877)
@@ -89,7 +89,7 @@
 
     /* finally ${prefix}/etc/macports/macports.conf, or whatever path was configured */
     if (mp->portconf == NULL) {
-      /* XXX: honor autoconf setting ($mports_conf_path) */
+      /* XXX: honor autoconf setting ($macports_conf_path) */
         char* path = "${prefix}/etc/macports/macports.conf";
         if (access(path, R_OK) == 0) {
             mp->portconf = strdup(path);

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