[32223] trunk/base/src/macports1.0/macports.tcl

[jmpp at macports.org]

Revision: 32223
          http://trac.macosforge.org/projects/macports/changeset/32223
Author:   jmpp at macports.org
Date:     2007-12-20 11:53:51 -0800 (Thu, 20 Dec 2007)

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

Rename the $mp_base_path variabe to $mp_source_path in the selfupdate proc, to make its intent clearer from its name.
Also change a debug comment accordingly.

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2007-12-20 19:52:23 UTC (rev 32222)
+++ trunk/base/src/macports1.0/macports.tcl	2007-12-20 19:53:51 UTC (rev 32223)
@@ -1638,11 +1638,11 @@
         return -code error "Couldn't sync the ports tree: $result"
     }
 
-    set mp_base_path [file join $portdbpath sources ${rsync_server} ${rsync_dir}/]
-    if {![file exists $mp_base_path]} {
-        file mkdir $mp_base_path
+    set mp_source_path [file join $portdbpath sources ${rsync_server} ${rsync_dir}/]
+    if {![file exists $mp_source_path]} {
+        file mkdir $mp_source_path
     }
-    ui_debug "MacPorts base dir: $mp_base_path"
+    ui_debug "MacPorts sources dir: $mp_source_path"
 
     # get user of the MacPorts system
     set user [file attributes [file join $portdbpath sources/] -owner]
@@ -1652,12 +1652,12 @@
     ui_msg "\nMacPorts base version $macports::autoconf::macports_version installed"
 
     ui_debug "Updating using rsync"
-    if { [catch { system "$rsync_path $rsync_options rsync://${rsync_server}/${rsync_dir} $mp_base_path" } ] } {
+    if { [catch { system "$rsync_path $rsync_options rsync://${rsync_server}/${rsync_dir} $mp_source_path" } ] } {
         return -code error "Error: rsync failed in selfupdate"
     }
 
     # get downloaded MacPorts version and write the old version back
-    set fd [open [file join $mp_base_path config mp_version] r]
+    set fd [open [file join $mp_source_path config mp_version] r]
     gets $fd mp_version_new
     close $fd
     ui_msg "\nDownloaded MacPorts base version $mp_version_new"
@@ -1694,7 +1694,7 @@
         }
         # do the actual installation of new base
         ui_debug "Install in: $prefix as $owner : $group - TCL-PACKAGE in $tclpackage"
-        if { [catch { system "cd $mp_base_path && ./configure --prefix=$prefix --with-install-user=$owner --with-install-group=$group --with-tclpackage=$tclpackage && make && make install" } result] } {
+        if { [catch { system "cd $mp_source_path && ./configure --prefix=$prefix --with-install-user=$owner --with-install-group=$group --with-tclpackage=$tclpackage && make && make install" } result] } {
             return -code error "Error installing new MacPorts base: $result"
         }
     } else {

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