summaryrefslogtreecommitdiffstats
path: root/cnf
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-12 08:19:22 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-12 08:19:22 +0000
commit5c0ad1463b7d48fa940ed49938816cddcddc55ad (patch)
treecc37b25b081506dfaf8eb8460f56de9ee9086f4c /cnf
parent3931a1e06f5ef8e8b5c0d3d82f2332f6441035c2 (diff)
downloadportage-5c0ad1463b7d48fa940ed49938816cddcddc55ad.tar.gz
portage-5c0ad1463b7d48fa940ed49938816cddcddc55ad.tar.bz2
portage-5c0ad1463b7d48fa940ed49938816cddcddc55ad.zip
Bug #253800 - Fix FETCHCOMMAND examples for SRC_URI arrow compatibility.
(trunk r12398) svn path=/main/branches/2.1.6/; revision=12458
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.conf15
1 files changed, 8 insertions, 7 deletions
diff --git a/cnf/make.conf b/cnf/make.conf
index d35c3ea88..8fd4ff8aa 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -125,19 +125,20 @@
#
# Portage uses wget by default. Here are some settings for some alternate
# downloaders -- note that you need to merge these programs first before they
-# will be available.
+# will be available. The command should be written to place the fetched file
+# at \${DISTDIR}/\${FILE}.
#
# Default fetch command (5 tries, passive ftp for firewall compatibility)
-#FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp \${URI} -P \${DISTDIR}"
-#RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp \${URI} -P \${DISTDIR}"
+#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}\""
#
# Using wget, ratelimiting downloads
-#FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}"
-#RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}"
+#FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp --limit-rate=200k -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
+#RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp --limit-rate=200k -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
#
# Lukemftp (BSD ftp):
-#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
-#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
+#FETCHCOMMAND="/usr/bin/lukemftp -s -a -o \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
+#RESUMECOMMAND="/usr/bin/lukemftp -s -a -R -o \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
#
# Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
# The list is a space separated list which is read left to right. If you use