Changeset 36687

Timestamp:

2008-05-11 15:01:57 (6 months ago)

Author:

jmr@…

Message:

back out the fetch part of r36679, as it breaks other phases

Files:

• trunk/base/src/port1.0/portfetch.tcl (modified) (8 diffs)

trunk/base/src/port1.0/portfetch.tcl

@@ -511 +511 @@
 # the listed url varable and associated distfile
 proc fetchfiles {args} {
-        global fulldistpath all_dist_files UI_PREFIX fetch_urls
+        global distpath all_dist_files UI_PREFIX fetch_urls
         global fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert
         global distfile site
         global portverbose
 
-        if {![file isdirectory $fulldistpath]} {
-                if {[catch {file mkdir $fulldistpath} result]} {
+        if {![file isdirectory $distpath]} {
+                if {[catch {file mkdir $distpath} result]} {
                         return -code error [format [msgcat::mc "Unable to create distribution files path: %s"] $result]
                 }
@@ -539 +539 @@
         
         foreach {url_var distfile} $fetch_urls {
-                if {![file isfile [file join $fulldistpath $distfile]]} {
-                        ui_info "$UI_PREFIX [format [msgcat::mc "%s doesn't seem to exist in %s"] $distfile $fulldistpath]"
-                        if {![file writable $fulldistpath]} {
-                                return -code error [format [msgcat::mc "%s must be writable"] $fulldistpath]
+                if {![file isfile $distpath/$distfile]} {
+                        ui_info "$UI_PREFIX [format [msgcat::mc "%s doesn't seem to exist in %s"] $distfile $distpath]"
+                        if {![file writable $distpath]} {
+                                return -code error [format [msgcat::mc "%s must be writable"] $distpath]
                         }
                         if {!$sorted} {
@@ -559 +559 @@
                                 set file_url [portfetch::assemble_url $site $distfile]
                                 set effectiveURL ""
-                                if {![catch {eval curl fetch --effective-url effectiveURL $fetch_options {$file_url} ${fulldistpath}/${distfile}.TMP} result] &&
-                                        ![catch {system "mv ${fulldistpath}/${distfile}.TMP ${fulldistpath}/${distfile}"}]} {
+                                if {![catch {eval curl fetch --effective-url effectiveURL $fetch_options {$file_url} ${distpath}/${distfile}.TMP} result] &&
+                                        ![catch {system "mv ${distpath}/${distfile}.TMP ${distpath}/${distfile}"}]} {
 
                                         # Special hack to check for sourceforge mirrors, which don't return a proper error code on failure
@@ -570 +570 @@
                                                 # The url seen by curl seems to have been a redirect to the sourceforge mirror page
                                                 ui_debug "[msgcat::mc "Fetching from sourceforge mirror failed"]"
-                                                exec rm -f [file join $fulldistpath ${distfile}.TMP]
+                                                exec rm -f ${distpath}/${distfile}.TMP
                                                 
                                                 # Continue on to try the next mirror, if any
@@ -583 +583 @@
                                 } else {
                                         ui_debug "[msgcat::mc "Fetching failed:"]: $result"
-                                        exec rm -f [file join $fulldistpath ${distfile}.TMP]
+                                        exec rm -f ${distpath}/${distfile}.TMP
                                 }
                         }
@@ -596 +596 @@
 # Utility function to delete fetched files.
 proc fetch_deletefiles {args} {
-        global fulldistpath fetch_urls
+        global distpath fetch_urls
         foreach {url_var distfile} $fetch_urls {
-                if {[file isfile [file join $fulldistpath $distfile]]} {
-                        exec rm -f [file join $fulldistpath $distfile]
+                if {[file isfile $distpath/$distfile]} {
+                        exec rm -f ${distpath}/${distfile}
                 }
         }
@@ -606 +606 @@
 # Utility function to add files to a list of fetched files.
 proc fetch_addfilestomap {filemapname} {
-        global fulldistpath fetch_urls $filemapname
+        global distpath fetch_urls $filemapname
         foreach {url_var distfile} $fetch_urls {
-                if {[file isfile [file join $fulldistpath $distfile]]} {
-                        filemap set $filemapname [file join $fulldistpath $distfile] 1
+                if {[file isfile $distpath/$distfile]} {
+                        filemap set $filemapname $distpath/$distfile 1
                 }
         }
@@ -616 +616 @@
 # Initialize fetch target
 proc fetch_init {args} {
-    global distfiles distname distpath fulldistpath all_dist_files dist_subdir fetch.type
-    
-    if {[info exist distpath]} {
-        if {[info exists dist_subdir]} {
-            set fulldistpath [file join $distpath $dist_subdir]
-        } else {
-            set fulldistpath $distpath
-        }
+    global distfiles distname distpath all_dist_files dist_subdir fetch.type
+    
+    if {[info exist distpath] && [info exists dist_subdir]} {
+        set distpath ${distpath}/${dist_subdir}
     }
 }