[prev in list] [next in list] [prev in thread] [next in thread] 

List:       macports-changes
Subject:    [37217] trunk/base/src/port1.0
From:       jmr () macports ! org
Date:       2008-05-30 12:12:23
Message-ID: 20080530121223.C2D4216EC88D () beta ! macosforge ! org
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Revision: 37217
          http://trac.macosforge.org/projects/macports/changeset/37217
Author:   jmr@macports.org
Date:     2008-05-30 05:12:21 -0700 (Fri, 30 May 2008)

Log Message:
-----------
Add our new distfile mirror (distfiles.macports.org) and automatically append it to master_sites.

Modified Paths:
--------------
    trunk/base/src/port1.0/portfetch.tcl
    trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl

Modified: trunk/base/src/port1.0/portfetch.tcl
===================================================================
--- trunk/base/src/port1.0/portfetch.tcl	2008-05-30 10:49:55 UTC (rev 37216)
+++ trunk/base/src/port1.0/portfetch.tcl	2008-05-30 12:12:21 UTC (rev 37217)
@@ -94,6 +94,7 @@
 default fetch.remote_time "no"
 
 default fallback_mirror_site "macports"
+default global_mirror_site "macports_distfiles"
 default mirror_sites.listfile {"mirror_sites.tcl"}
 default mirror_sites.listpath {"${portresourcepath}/fetch/"}
 
@@ -218,13 +219,15 @@
 # sites
 proc checksites {args} {
     global patch_sites master_sites master_sites.mirror_subdir \
-        patch_sites.mirror_subdir fallback_mirror_site env
+        patch_sites.mirror_subdir fallback_mirror_site global_mirror_site env
     
-    append master_sites " ${fallback_mirror_site}"
+    append master_sites " ${global_mirror_site} ${fallback_mirror_site}"
     if {[info exists env(MASTER_SITE_LOCAL)]} {
 	set master_sites [concat $env(MASTER_SITE_LOCAL) $master_sites]
     }
     
+    # we probably want to mirror downloaded patches
+    # on distfiles.macports.org too, but we don't currently
     append patch_sites " ${fallback_mirror_site}"
     if {[info exists env(PATCH_SITE_LOCAL)]} {
 	set patch_sites [concat $env(PATCH_SITE_LOCAL) $patch_sites]

Modified: trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl
===================================================================
--- trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl	2008-05-30 10:49:55 UTC (rev 37216)
+++ trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl	2008-05-30 12:12:21 UTC (rev 37217)
@@ -180,6 +180,10 @@
     http://svn.macports.org/repository/macports/downloads/
 }
 
+set portfetch::mirror_sites::sites(macports_distfiles) {
+    http://distfiles.macports.org/:mirror
+}
+
 set portfetch::mirror_sites::sites(openbsd) {
     http://mirror.roothell.org/pub/OpenBSD/
     http://www.mirrorservice.org/sites/ftp.openbsd.org/pub/OpenBSD/


[Attachment #5 (text/html)]

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style \
type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: \
6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt;  } #msg dl a { font-weight: \
bold} #msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; \
padding: 6px; } #msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
 #patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
                .info {color:#888;background:#fff;}
--></style>
<title>[37217] trunk/base/src/port1.0</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a \
href="http://trac.macosforge.org/projects/macports/changeset/37217">37217</a></dd> \
<dt>Author</dt> <dd>jmr@macports.org</dd> <dt>Date</dt> <dd>2008-05-30 05:12:21 -0700 \
(Fri, 30 May 2008)</dd> </dl>

<h3>Log Message</h3>
<pre>Add our new distfile mirror (distfiles.macports.org) and automatically append it \
to master_sites.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10portfetchtcl">trunk/base/src/port1.0/portfetch.tcl</a></li>
 <li><a href="#trunkbasesrcport10resourcesfetchmirror_sitestcl">trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcport10portfetchtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portfetch.tcl (37216 => \
37217)</h4> <pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portfetch.tcl	2008-05-30 10:49:55 UTC \
                (rev 37216)
+++ trunk/base/src/port1.0/portfetch.tcl	2008-05-30 12:12:21 UTC (rev 37217)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> default fetch.remote_time &quot;no&quot;
</span><span class="cx"> 
</span><span class="cx"> default fallback_mirror_site &quot;macports&quot;
</span><ins>+default global_mirror_site &quot;macports_distfiles&quot;
</ins><span class="cx"> default mirror_sites.listfile {&quot;mirror_sites.tcl&quot;}
</span><span class="cx"> default mirror_sites.listpath \
{&quot;${portresourcepath}/fetch/&quot;} </span><span class="cx"> 
</span><span class="lines">@@ -218,13 +219,15 @@
</span><span class="cx"> # sites
</span><span class="cx"> proc checksites {args} {
</span><span class="cx">     global patch_sites master_sites \
master_sites.mirror_subdir \ </span><del>-        patch_sites.mirror_subdir \
fallback_mirror_site env </del><ins>+        patch_sites.mirror_subdir \
fallback_mirror_site global_mirror_site env </ins><span class="cx">     
</span><del>-    append master_sites &quot; ${fallback_mirror_site}&quot;
</del><ins>+    append master_sites &quot; ${global_mirror_site} \
${fallback_mirror_site}&quot; </ins><span class="cx">     if {[info exists \
env(MASTER_SITE_LOCAL)]} { </span><span class="cx"> 	set master_sites [concat \
$env(MASTER_SITE_LOCAL) $master_sites] </span><span class="cx">     }
</span><span class="cx">     
</span><ins>+    # we probably want to mirror downloaded patches
+    # on distfiles.macports.org too, but we don't currently
</ins><span class="cx">     append patch_sites &quot; ${fallback_mirror_site}&quot;
</span><span class="cx">     if {[info exists env(PATCH_SITE_LOCAL)]} {
</span><span class="cx"> 	set patch_sites [concat $env(PATCH_SITE_LOCAL) \
$patch_sites] </span></span></pre></div>
<a id="trunkbasesrcport10resourcesfetchmirror_sitestcl"></a>
<div class="modfile"><h4>Modified: \
trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl (37216 => 37217)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl	2008-05-30 10:49:55 UTC (rev \
                37216)
+++ trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl	2008-05-30 12:12:21 UTC \
(rev 37217) </span><span class="lines">@@ -180,6 +180,10 @@
</span><span class="cx">     http://svn.macports.org/repository/macports/downloads/
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+set portfetch::mirror_sites::sites(macports_distfiles) {
+    http://distfiles.macports.org/:mirror
+}
+
</ins><span class="cx"> set portfetch::mirror_sites::sites(openbsd) {
</span><span class="cx">     http://mirror.roothell.org/pub/OpenBSD/
</span><span class="cx">     \
http://www.mirrorservice.org/sites/ftp.openbsd.org/pub/OpenBSD/ </span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
macports-changes mailing list
macports-changes@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo.cgi/macports-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic