Add default values for FETCHCOMMAND_SSH and RESUMECOMMAND_SSH

[portage.git] / cnf / make.globals

diff --git a/cnf/make.globals b/cnf/make.globals
index b1b2cf49c248af34b3f9b6e7bf621b39e04bb4fc..d14d0519e592a1ac232655bc7ce92196bc0f5097 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -1,6 +1,5 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -41,16 +40,25 @@ PORTAGE_TMPDIR=/var/tmp
 FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
 RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
 
+FETCHCOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
+RESUMECOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
+
+FETCHCOMMAND_SSH="bash -c \"x=\\\${2#ssh://} ; exec rsync -avP \\\"\\\${x%%/*}:/\\\${x#*/}\\\" \\\"\\\$1\\\"\" rsync \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
+RESUMECOMMAND_SSH=${FETCHCOMMAND_SSH}
+
 # Default user options
-FEATURES="assume-digests distlocks fixpackages news parallel-fetch protect-owned
-          sandbox sfperms strict unmerge-logs unmerge-orphans userfetch"
+FEATURES="assume-digests binpkg-logs distlocks fixpackages
+          fixlafiles news parallel-fetch protect-owned
+          sandbox sfperms strict unknown-features-warn unmerge-logs
+          unmerge-orphans userfetch"
 
 # Ignore file collisions in /lib/modules since files inside this directory
 # are never unmerged, and therefore collisions must be ignored in order for
 # FEATURES=protect-owned to operate smoothly in all cases.
 COLLISION_IGNORE="/lib/modules"
 
-# Enable for global testing
+# Enable preserve-libs for testing with portage versions that support it.
+# This setting is commented out for portage versions that don't support it.
 FEATURES="${FEATURES} preserve-libs"
 
 # Default chunksize for binhost comms
@@ -66,6 +74,8 @@ EMERGE_WARNING_DELAY="10"
 # This option will be removed and forced to yes.
 AUTOCLEAN="yes"
 
+PORTAGE_BZIP2_COMMAND="bzip2"
+
 # Don't compress files with these suffixes.
 PORTAGE_COMPRESS_EXCLUDE_SUFFIXES="css gif htm[l]? jp[e]?g js pdf png"