[151037] trunk/base

ryandesign at macports.org ryandesign at macports.org
Fri Aug 5 15:19:46 PDT 2016 

Revision: 151037
          https://trac.macports.org/changeset/151037
Author:   ryandesign at macports.org
Date:     2016-08-05 15:19:46 -0700 (Fri, 05 Aug 2016)
Log Message:
-----------
update default rsync paths

Modified Paths:
--------------
    trunk/base/config/README.TXT
    trunk/base/doc/macports.conf.5
    trunk/base/doc/macports.conf.5.txt
    trunk/base/doc/macports.conf.in
    trunk/base/doc/sources.conf
    trunk/base/doc/sources.conf.5
    trunk/base/doc/sources.conf.5.txt
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/macports1.0/tests/macports.test
    trunk/base/src/macports1.0/tests/sources.conf
    trunk/base/tests/test-macports.conf

Modified: trunk/base/config/README.TXT
===================================================================
--- trunk/base/config/README.TXT	2016-08-05 21:35:09 UTC (rev 151036)
+++ trunk/base/config/README.TXT	2016-08-05 22:19:46 UTC (rev 151037)
@@ -1,6 +1,6 @@
 The file RELEASE_URL in this directory is used by the rsync infrastructure
 at the MacPorts server to control the tag from which "released" code is provided,
-ultimately at rsync://rsync.macports.org/release/base/.
+ultimately at rsync://rsync.macports.org/macports/release/base/.
 
 The script handling that operation checks out from svn the code tagged by the
 contents of the RELEASE_URL file and makes that code available via rsync.

Modified: trunk/base/doc/macports.conf.5
===================================================================
--- trunk/base/doc/macports.conf.5	2016-08-05 21:35:09 UTC (rev 151036)
+++ trunk/base/doc/macports.conf.5	2016-08-05 22:19:46 UTC (rev 151037)
@@ -444,7 +444,7 @@
 T{
 \fBDefault:\fR
 T}:T{
-release/base/ (which pulls sources for the currently shipping MacPorts release)
+macports/release/base/ (which pulls sources for the currently shipping MacPorts release)
 T}
 .TE
 .sp 1

Modified: trunk/base/doc/macports.conf.5.txt
===================================================================
--- trunk/base/doc/macports.conf.5.txt	2016-08-05 21:35:09 UTC (rev 151036)
+++ trunk/base/doc/macports.conf.5.txt	2016-08-05 22:19:46 UTC (rev 151037)
@@ -155,7 +155,7 @@
 
 rsync_dir::
     Rsync directory from which to pull MacPorts sources from the rsync server.
-    *Default:*;; release/base/ (which pulls sources for the currently shipping
+    *Default:*;; macports/release/base/ (which pulls sources for the currently shipping
     MacPorts release)
 
 rsync_options::

Modified: trunk/base/doc/macports.conf.in
===================================================================
--- trunk/base/doc/macports.conf.in	2016-08-05 21:35:09 UTC (rev 151036)
+++ trunk/base/doc/macports.conf.in	2016-08-05 22:19:46 UTC (rev 151037)
@@ -116,7 +116,7 @@
 # and will be used to verify its integrity. See
 # https://trac.macports.org/wiki/Mirrors#MacPortsSource to find the
 # correct rsync_dir for a particular rsync_server.
-#rsync_dir           	release/tarballs/base.tar
+#rsync_dir           	macports/release/tarballs/base.tar
 
 # Options to pass to rsync when fetching MacPorts base and the ports tree.
 #rsync_options       	-rtzv --delete-after

Modified: trunk/base/doc/sources.conf
===================================================================
--- trunk/base/doc/sources.conf	2016-08-05 21:35:09 UTC (rev 151036)
+++ trunk/base/doc/sources.conf	2016-08-05 22:19:46 UTC (rev 151037)
@@ -29,4 +29,4 @@
 # sites, etc.), the primary MacPorts source must always be tagged
 # "[default]", even if switched from the default "rsync://" URL.
 
-rsync://rsync.macports.org/release/tarballs/ports.tar [default]
+rsync://rsync.macports.org/macports/release/tarballs/ports.tar [default]

Modified: trunk/base/doc/sources.conf.5
===================================================================
--- trunk/base/doc/sources.conf.5	2016-08-05 21:35:09 UTC (rev 151036)
+++ trunk/base/doc/sources.conf.5	2016-08-05 22:19:46 UTC (rev 151037)
@@ -46,12 +46,12 @@
 .PP
 \fBExample\fR
 .RS 4
-rsync://rsync\&.macports\&.org/release/tarballs/ports\&.tar
+rsync://rsync\&.macports\&.org/macports/release/tarballs/ports\&.tar
 .RE
 .PP
 \fBDefault\fR
 .RS 4
-rsync://rsync\&.macports\&.org/release/tarballs/ports\&.tar [default]
+rsync://rsync\&.macports\&.org/macports/release/tarballs/ports\&.tar [default]
 .RE
 .RE
 .PP

Modified: trunk/base/doc/sources.conf.5.txt
===================================================================
--- trunk/base/doc/sources.conf.5.txt	2016-08-05 21:35:09 UTC (rev 151036)
+++ trunk/base/doc/sources.conf.5.txt	2016-08-05 22:19:46 UTC (rev 151037)
@@ -38,9 +38,9 @@
     a pre-generated PortIndex (including the PortIndex.quick file) from there.
     +
     *Example*;;
-        rsync://rsync.macports.org/release/tarballs/ports.tar
+        rsync://rsync.macports.org/macports/release/tarballs/ports.tar
     *Default*;;
-        rsync://rsync.macports.org/release/tarballs/ports.tar [default]
+        rsync://rsync.macports.org/macports/release/tarballs/ports.tar [default]
 
 'file://'::
     Followed by an absolute path (which will result in *three* slashes at the

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2016-08-05 21:35:09 UTC (rev 151036)
+++ trunk/base/src/macports1.0/macports.tcl	2016-08-05 22:19:46 UTC (rev 151037)
@@ -915,7 +915,7 @@
     }
     if {![info exists rsync_dir]} {
         global macports::rsync_dir
-        set macports::rsync_dir release/tarballs/base.tar
+        set macports::rsync_dir macports/release/tarballs/base.tar
     }
     if {![info exists rsync_options]} {
         global macports::rsync_options

Modified: trunk/base/src/macports1.0/tests/macports.test
===================================================================
--- trunk/base/src/macports1.0/tests/macports.test	2016-08-05 21:35:09 UTC (rev 151036)
+++ trunk/base/src/macports1.0/tests/macports.test	2016-08-05 22:19:46 UTC (rev 151037)
@@ -617,7 +617,7 @@
 } -body {
     set macports::portdbpath $pwd/portdbpath
     set url "http://packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2"
-    set default_path $pwd/portdbpath/sources/rsync.macports.org/release/tarballs/ports/_resources
+    set default_path $pwd/portdbpath/sources/rsync.macports.org/macports/release/tarballs/ports/_resources
     set fallback_path $pwd/portdbpath/sources/packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2/_resources
 
     if {[macports::getportresourcepath $url "" yes] ne $default_path} {

Modified: trunk/base/src/macports1.0/tests/sources.conf
===================================================================
--- trunk/base/src/macports1.0/tests/sources.conf	2016-08-05 21:35:09 UTC (rev 151036)
+++ trunk/base/src/macports1.0/tests/sources.conf	2016-08-05 22:19:46 UTC (rev 151037)
@@ -25,4 +25,4 @@
 # For proper functionality of various resources (port groups, mirror
 # sites, etc.), the primary MacPorts source must always be tagged
 # "[default]", even if switched from the default "rsync://" URL.
-rsync://rsync.macports.org/release/tarballs/ports.tar [default]
+rsync://rsync.macports.org/macports/release/tarballs/ports.tar [default]

Modified: trunk/base/tests/test-macports.conf
===================================================================
--- trunk/base/tests/test-macports.conf	2016-08-05 21:35:09 UTC (rev 151036)
+++ trunk/base/tests/test-macports.conf	2016-08-05 22:19:46 UTC (rev 151037)
@@ -34,7 +34,7 @@
 rsync_server		rsync.macports.org
 
 # Rsync directory from which to pull the base/ component (infrastructure) of MacPorts
-rsync_dir			release/base/
+rsync_dir			macports/release/base/
 
 # Rsync options
 rsync_options		-rtzv --delete-after
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160805/6b907759/attachment.html>

More information about the macports-changes mailing list