Changeset 18739 for trunk/base

Timestamp:

Jul 26, 2006, 3:49:41 AM (18 years ago)

Author:

yeled

Message:

Bug: 5269
Submitted by: yeled

this makes the portfetch code even uglier. i'm happy to back this out if it
proves to be too ugly.

what is *does* is grab the $patchfiles even if you fetch via CVS/SVN

File:

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

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

@@ -1 +1 @@
 # et:ts=4
 # portfetch.tcl
-# $Id: portfetch.tcl,v 1.112 2006/06/10 23:04:29 pguyot Exp $
+# $Id: portfetch.tcl,v 1.113 2006/07/26 03:49:41 yeled Exp $
 #
 # Copyright (c) 2002 - 2003 Apple Computer, Inc.
@@ -278 +278 @@
     global workpath cvs.env cvs.cmd cvs.args cvs.post_args 
     global cvs.root cvs.date cvs.tag cvs.password
+    global patch_sites patchfiles filespath fetch_urls
 
     set cvs.args "co ${cvs.args}"
@@ -312 +313 @@
     }
 
+# XXX this is a hack to make cvsfetch do the same as "standard fetch"
+# should be it's own routine that can be called.
+    if {[info exists patchfiles]} {
+        foreach file $patchfiles {
+            if {![file exists $filespath/$file]} {
+                set distsite [getdisttag $file]
+                set file [getdistname $file]
+                lappend all_dist_files $file
+                if {$distsite != ""} {
+                    lappend fetch_urls $distsite $file
+                } elseif {[info exists patch_sites]} {
+                    lappend fetch_urls patch_sites $file
+                } 
+            }
+        }
+        return [fetchfiles]
+    }
     return 0
 }
@@ -344 +362 @@
     }
 
+# XXX this is a hack to make svnfetch do the same as "standard fetch" (untested)
+# should be it's own routine that can be called.
+    if {[info exists patchfiles]} {
+        foreach file $patchfiles {
+            if {![file exists $filespath/$file]} {
+                set distsite [getdisttag $file]
+                set file [getdistname $file]
+                lappend all_dist_files $file
+                if {$distsite != ""} {
+                    lappend fetch_urls $distsite $file
+                } elseif {[info exists patch_sites]} {
+                    lappend fetch_urls patch_sites $file
+                } 
+            }
+        }
+        return [fetchfiles]
+    }
+
     return 0
 }
@@ -379 +415 @@
                                 return -code error [format [msgcat::mc "%s must be writable"] $distpath]
                         }
-                        global portfetch::$url_var
+# add master_sites & patch_sites here for when we call it from cvsfetch..
+                        global portfetch::$url_var master_sites patch_sites
                         if {![info exists $url_var]} {
                                 ui_error [format [msgcat::mc "No defined site for tag: %s, using master_sites"] $url_var]