add -l option to rsync_options.

For plain rsync-updating of base, not handling symlinks will skip them and thus lead to compile errors when building base's internal TCL version - which is symlinked to vendor/tcl. This is not needed for the new and preferred tarball mechanism. Fixes: https://trac.macports.org/ticket/53414 (cherry picked from commit ff4f043) (cherry picked from commit b5daf1a)
macports · Feb 17, 2017 · 8dfd82d · 8dfd82d
1 parent dce55c6
commit 8dfd82d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/doc/macports.conf.5.txt b/doc/macports.conf.5.txt
@@ -160,7 +160,7 @@ rsync_dir::
 
 rsync_options::
     Default rsync options to use when connecting to the rsync server.
-    *Default:*;; -rtzv --delete-after
+    *Default:*;; -rtzvl --delete-after
 
 binpath::
     Sets the directory search path for locating system executables used by

diff --git a/doc/macports.conf.in b/doc/macports.conf.in
@@ -117,7 +117,7 @@ universal_archs     	@UNIVERSAL_ARCHS@
 #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
+#rsync_options       	-rtzvl --delete-after
 
 # Type of generated StartupItems.
 # - launchd: Create StartupItems for use with launchd.

diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
@@ -923,7 +923,7 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
     }
     if {![info exists rsync_options]} {
         global macports::rsync_options
-        set rsync_options "-rtzv --delete-after"
+        set rsync_options "-rtzvl --delete-after"
     }
 
     set portsharepath ${prefix}/share/macports

diff --git a/tests/test-macports.conf b/tests/test-macports.conf
@@ -36,7 +36,7 @@ rsync_server		rsync.macports.org
 rsync_dir			macports/release/base/
 
 # Rsync options
-rsync_options		-rtzv --delete-after
+rsync_options		-rtzvl --delete-after
 
 # Options for generated startup items
 # startupitem_type may be "default", "systemstarter", or "launchd";