Changeset 79470

Timestamp:

06/14/11 08:46:19 (4 years ago)

Author:

jmr@…

Message:

fixes for rsyncing tarball

File:

• trunk/base/src/macports1.0/macports.tcl (modified) (2 diffs)

trunk/base/src/macports1.0/macports.tcl

@@ -2024 +2024 @@
                     # 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]} {
@@ -2038 +2039 @@
                     if {$is_tarball} {
                         # chop ports.tar off the end
-                        set source [string range $source 0 end-[string length [file tail $source]]]
-                    }
-                    set remote_indexfile "${source}PortIndex_${macports::os_platform}_${macports::os_major}_${macports::os_arch}/PortIndex"
+                        set index_source [string range $source 0 end-[string length [file tail $source]]]
+                    } else {
+                        set index_source $source 
+                    }
+                    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