Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 97074 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-6 / +7 lines)
Line  Link Here
0
-- portage-2.0.53/bin/etc-update
0
++ portage-2.0.53/bin/etc-update
Lines 12-18 Link Here
12
12
13
export PORTAGE_CALLER="etc-update"
13
export PORTAGE_CALLER="etc-update"
14
14
15
eval $(python -c 'import portage; print "export PORTAGE_TMPDIR="+portage.settings["PORTAGE_TMPDIR"];')
15
eval "$(python <<\EOF
16
import portage, re
17
for var in "CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "PORTAGE_TMPDIR":
18
	print var+"='"+re.sub("'", "'\\''", portage.settings[var])+"'"
19
EOF
20
)"
16
if type -p gsed >/dev/null ; then
21
if type -p gsed >/dev/null ; then
17
	function sed() { gsed "$@"; }
22
	function sed() { gsed "$@"; }
Lines 366-375 Link Here
366
rm -rf ${TMP} 2> /dev/null
371
rm -rf ${TMP} 2> /dev/null
367
mkdir ${TMP} || die "failed mkdir command!" 1
372
mkdir ${TMP} || die "failed mkdir command!" 1
368
373
369
# I need the CONFIG_PROTECT value
370
CONFIG_PROTECT=$(/usr/lib/portage/bin/portageq config_protect)
371
CONFIG_PROTECT_MASK=$(/usr/lib/portage/bin/portageq config_protect_mask)
372
373
# load etc-config's configuration
374
# load etc-config's configuration
374
EU_AUTOMERGE=`get_config eu_automerge`
375
EU_AUTOMERGE=`get_config eu_automerge`
375
rm_opts=`get_config rm_opts`
376
rm_opts=`get_config rm_opts`

Return to bug 97074