summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-03-11 07:14:24 +0000
committerZac Medico <zmedico@gentoo.org>2006-03-11 07:14:24 +0000
commitba7fd15c1f3e8c0bb3c137186097b7f41f096e3d (patch)
treeedae0216713e523a76f5d6016b642dd27c218092
parent5570363b6c9b75df1d6320f92ec28ccbe7111998 (diff)
downloadportage-ba7fd15c1f3e8c0bb3c137186097b7f41f096e3d.tar.gz
portage-ba7fd15c1f3e8c0bb3c137186097b7f41f096e3d.tar.bz2
portage-ba7fd15c1f3e8c0bb3c137186097b7f41f096e3d.zip
Move PORTAGE_INST_UID and PORTAGE_INST_GID from ebuild.sh to make.globals so they can be overridden.
svn path=/main/trunk/; revision=2846
-rwxr-xr-xbin/ebuild.sh4
-rw-r--r--cnf/make.globals4
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c4bc9bff5..be68b84ac 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1019,10 +1019,6 @@ dyn_test() {
trap SIGINT SIGQUIT
}
-
-PORTAGE_INST_UID="0"
-PORTAGE_INST_GID="0"
-
dyn_install() {
[ -z "$PORTAGE_BUILDDIR" ] && die "${FUNCNAME}: PORTAGE_BUILDDIR is unset"
trap "abort_install" SIGINT SIGQUIT
diff --git a/cnf/make.globals b/cnf/make.globals
index 0eb5077cf..2586ca2fa 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -60,6 +60,10 @@ CONFIG_PROTECT="/etc"
# Disable auto-use
USE_ORDER="env:pkg:conf:defaults"
+# Default ownership of installed files.
+PORTAGE_INST_UID="0"
+PORTAGE_INST_GID="0"
+
# *****************************
# ** DO NOT EDIT THIS FILE **
# ***************************************************