summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-30 03:14:25 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-30 03:14:25 +0000
commit90114b634459bfe1ef351d79f1dc38590dbc56dd (patch)
tree9cc73a9a9b5d7bb2a94cb6d97f4462bdeca08799
parentWhen dblink.treewalk() looks for an installed instance in the same slot, make... (diff)
downloadportage-multirepo-90114b634459bfe1ef351d79f1dc38590dbc56dd.tar.gz
portage-multirepo-90114b634459bfe1ef351d79f1dc38590dbc56dd.tar.bz2
portage-multirepo-90114b634459bfe1ef351d79f1dc38590dbc56dd.zip
For bug #153967, use -O ${DISTDIR}/${FILE} in the default FETCHCOMMAND. (branches/2.1.2 r6761)
svn path=/main/branches/2.1.2.9/; revision=7449
-rw-r--r--cnf/make.globals5
1 files changed, 2 insertions, 3 deletions
diff --git a/cnf/make.globals b/cnf/make.globals
index f857ff43..b589d9d1 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -33,7 +33,7 @@ FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp -O \${DISTDIR}/\${FILE} \${
RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp -O \${DISTDIR}/\${FILE} \${URI}"
# Default user options
-FEATURES="distlocks metadata-transfer sandbox sfperms strict unmerge-orphans userfetch"
+FEATURES="sandbox distlocks metadata-transfer"
# Default chunksize for binhost comms
PORTAGE_BINHOST_CHUNKSIZE="3000"
@@ -61,7 +61,7 @@ CONFIG_PROTECT="/etc"
CONFIG_PROTECT_MASK="/etc/env.d"
# Disable auto-use
-USE_ORDER="env:pkg:conf:defaults:pkginternal:env.d"
+USE_ORDER="env:pkg:conf:defaults:pkginternal"
# Default ownership of installed files.
PORTAGE_INST_UID="0"
@@ -72,7 +72,6 @@ PORTAGE_WORKDIR_MODE="0700"
# Some defaults for elog
PORTAGE_ELOG_CLASSES="log warn error"
-PORTAGE_ELOG_SYSTEM="save_summary echo"
PORTAGE_ELOG_MAILURI="root"
PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"