diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2010-01-24 17:58:52 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2010-01-24 17:58:52 +0000 |
| commit | 74d11b22b275bf0c26197e200fc9df8e35cf79ea (patch) | |
| tree | edac23741e6c1cb9e70b095455b28684d02dc60d /profiles/base | |
| parent | Move dev-lang/nasm to DEPEND (diff) | |
| download | gentoo-2-74d11b22b275bf0c26197e200fc9df8e35cf79ea.tar.gz gentoo-2-74d11b22b275bf0c26197e200fc9df8e35cf79ea.tar.bz2 gentoo-2-74d11b22b275bf0c26197e200fc9df8e35cf79ea.zip | |
Moved PYTHONDONTWRITEBYTECODE from profile.bashrc to make.defaults to make sure it's set for pm's other than portage as well.
Diffstat (limited to 'profiles/base')
| -rw-r--r-- | profiles/base/make.defaults | 7 | ||||
| -rw-r--r-- | profiles/base/profile.bashrc | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 87b6e5bda0d8..b3918fcf0fc6 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.48 2009/12/03 16:04:28 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.49 2010/01/24 17:58:52 dev-zero Exp $ # # System-wide defaults for the Portage system # See portage(5) manpage @@ -66,3 +66,8 @@ RUBY_TARGETS="ruby18" # instead of USE nocxx. # http://archives.gentoo.org/gentoo-dev/msg_a181cd0d36600067b599f4b996c6989f.xml USE="${USE} cxx" + +# Tiziano Müller <dev-zero@gentoo.org> (24 Jan 2010) +# We usually don't want python to (re)write .py[co] files during phase runs +# since it could cause sandbox violations +PYTHONDONTWRITEBYTECODE="1" diff --git a/profiles/base/profile.bashrc b/profiles/base/profile.bashrc index 9b2e70a0916d..c5a9580c1c98 100644 --- a/profiles/base/profile.bashrc +++ b/profiles/base/profile.bashrc @@ -1,10 +1,6 @@ # Copyright 2006-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/profile.bashrc,v 1.4 2009/10/16 17:37:56 arfrever Exp $ - -if [[ ${EBUILD_PHASE} == "setup" ]]; then - export PYTHONDONTWRITEBYTECODE="1" -fi +# $Header: /var/cvsroot/gentoo-x86/profiles/base/profile.bashrc,v 1.5 2010/01/24 17:58:52 dev-zero Exp $ for conf in ${PN} ${PN}-${PV} ${PN}-${PV}-${PR}; do [[ -r ${PORTAGE_CONFIGROOT}/etc/portage/env/${CATEGORY}/${conf} ]] \ |