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 / +10 lines)
Line  Link Here
0
-- /usr/sbin/etc-update
0
++ ./etc-update
Lines 12-18 Link Here
12
12
13
export PORTAGE_CALLER="etc-update"
13
export PORTAGE_CALLER="etc-update"
14
14
15
USERLAND="$(/usr/lib/portage/bin/portageq envvar USERLAND)"
15
{
16
read USERLAND
17
read CONFIG_PROTECT
18
read CONFIG_PROTECT_MASK
19
} <<< "$(python -c 'import portage
20
print portage.settings["USERLAND"]
21
print portage.settings["CONFIG_PROTECT"]
22
print portage.settings["CONFIG_PROTECT_MASK"]')"
23
16
if [ "$USERLAND" == "BSD" ] ; then
24
if [ "$USERLAND" == "BSD" ] ; then
17
	function sed() { gsed "$@"; }
25
	function sed() { gsed "$@"; }
18
elif [ "$USERLAND" == "Darwin" ] && [ -x /bin/gsed ]; then
26
elif [ "$USERLAND" == "Darwin" ] && [ -x /bin/gsed ]; then
Lines 361-370 Link Here
361
rm -rf ${TMP} 2> /dev/null
369
rm -rf ${TMP} 2> /dev/null
362
mkdir ${TMP} || die "failed mkdir command!" 1
370
mkdir ${TMP} || die "failed mkdir command!" 1
363
371
364
# I need the CONFIG_PROTECT value
365
CONFIG_PROTECT=$(/usr/lib/portage/bin/portageq config_protect)
366
CONFIG_PROTECT_MASK=$(/usr/lib/portage/bin/portageq config_protect_mask)
367
368
# load etc-config's configuration
372
# load etc-config's configuration
369
EU_AUTOMERGE=`get_config eu_automerge`
373
EU_AUTOMERGE=`get_config eu_automerge`
370
rm_opts=`get_config rm_opts`
374
rm_opts=`get_config rm_opts`

Return to bug 97074