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

[jmr at macports.org]

Revision: 79470
          http://trac.macports.org/changeset/79470
Author:   jmr at macports.org
Date:     2011-06-14 08:46:19 -0700 (Tue, 14 Jun 2011)
Log Message:
-----------
fixes for rsyncing tarball

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2011-06-14 15:45:16 UTC (rev 79469)
+++ trunk/base/src/macports1.0/macports.tcl	2011-06-14 15:46:19 UTC (rev 79470)
@@ -2023,6 +2023,7 @@
                     }
                     # save the local PortIndex data
                     if {[file isfile $indexfile]} {
+                        file copy -force $indexfile ${destdir}/
                         file rename -force $indexfile ${destdir}/tmp/ports/
                         if {[file isfile ${indexfile}.quick]} {
                             file rename -force ${indexfile}.quick ${destdir}/tmp/ports/
@@ -2037,9 +2038,11 @@
                 if {![file isfile $indexfile] || [expr [clock seconds] - [file mtime $indexfile]] > 86400} {
                     if {$is_tarball} {
                         # chop ports.tar off the end
-                        set source [string range $source 0 end-[string length [file tail $source]]]
+                        set index_source [string range $source 0 end-[string length [file tail $source]]]
+                    } else {
+                        set index_source $source 
                     }
-                    set remote_indexfile "${source}PortIndex_${macports::os_platform}_${macports::os_major}_${macports::os_arch}/PortIndex"
+                    set remote_indexfile "${index_source}PortIndex_${macports::os_platform}_${macports::os_major}_${macports::os_arch}/PortIndex"
                     set rsync_commandline "${macports::autoconf::rsync_path} ${rsync_options} $remote_indexfile ${destdir}"
                     ui_debug $rsync_commandline
                     if {[catch {system $rsync_commandline}]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110614/29d8e032/attachment.html>