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

Collapse All | Expand All

(-)a/pym/_emerge/emergelog.py (-2 / +1 lines)
Lines 13-25 from portage import _unicode_decode Link Here
13
from portage import _unicode_encode
13
from portage import _unicode_encode
14
from portage.data import secpass
14
from portage.data import secpass
15
from portage.output import xtermTitle
15
from portage.output import xtermTitle
16
from portage.const import EPREFIX
17
16
18
# We disable emergelog by default, since it's called from
17
# We disable emergelog by default, since it's called from
19
# dblink.merge() and we don't want that to trigger log writes
18
# dblink.merge() and we don't want that to trigger log writes
20
# unless it's really called via emerge.
19
# unless it's really called via emerge.
21
_disable = True
20
_disable = True
22
_emerge_log_dir = EPREFIX + '/var/log'
21
_emerge_log_dir = '/var/log'
23
22
24
# Coerce to unicode, in order to prevent TypeError when writing
23
# Coerce to unicode, in order to prevent TypeError when writing
25
# raw bytes to TextIOWrapper with python2.
24
# raw bytes to TextIOWrapper with python2.
(-)a/pym/_emerge/main.py (-3 / +1 lines)
Lines 1368-1376 def missing_sets_warning(root_config, missing_sets): Link Here
1368
		"missing set(s): %s" % missing_sets_str]
1368
		"missing set(s): %s" % missing_sets_str]
1369
	if root_config.sets:
1369
	if root_config.sets:
1370
		msg.append("        sets defined: %s" % ", ".join(root_config.sets))
1370
		msg.append("        sets defined: %s" % ", ".join(root_config.sets))
1371
	global_config_path = portage.const.GLOBAL_CONFIG_PATH
1371
	global_config_path = os.path.join(root_config.settings['EROOT'],
1372
	if root_config.settings['EPREFIX']:
1373
		global_config_path = os.path.join(root_config.settings['EPREFIX'],
1374
				portage.const.GLOBAL_CONFIG_PATH.lstrip(os.sep))
1372
				portage.const.GLOBAL_CONFIG_PATH.lstrip(os.sep))
1375
	msg.append("        This usually means that '%s'" % \
1373
	msg.append("        This usually means that '%s'" % \
1376
		(os.path.join(global_config_path, "sets/portage.conf"),))
1374
		(os.path.join(global_config_path, "sets/portage.conf"),))
(-)a/pym/portage/__init__.py (+6 lines)
Lines 508-513 def create_trees(config_root=None, target_root=None, trees=None, env=None, Link Here
508
		env = os.environ
508
		env = os.environ
509
	settings = config(config_root=config_root, target_root=target_root,
509
	settings = config(config_root=config_root, target_root=target_root,
510
		env=env, eprefix=eprefix)
510
		env=env, eprefix=eprefix)
511
	# override EPREFIX and EROOT with os.environ['EPREFIX'] for final building
512
	settings['EMERGE_LOG_DIR'] = os.path.join(os.sep, settings["EPREFIX"].rstrip(os.sep), "var", "log")
513
	settings['EPREFIX'] = os.environ.get('EPREFIX', settings['EPREFIX'])
514
	settings['EROOT'] = settings['ROOT'].rstrip(os.sep) + settings['EPREFIX'] + os.sep
515
	settings.backup_changes("EPREFIX")
516
	settings.backup_changes("EROOT")
511
	settings.lock()
517
	settings.lock()
512
518
513
	trees._target_eroot = settings['EROOT']
519
	trees._target_eroot = settings['EROOT']
(-)a/pym/portage/const.py (-6 lines)
Lines 11-22 import os Link Here
11
11
12
# save the original prefix
12
# save the original prefix
13
BPREFIX = EPREFIX
13
BPREFIX = EPREFIX
14
# pick up EPREFIX from the environment if set
15
if "EPREFIX" in os.environ:
16
	if os.environ["EPREFIX"] != "":
17
		EPREFIX = os.path.normpath(os.environ["EPREFIX"])
18
	else:
19
		EPREFIX = os.environ["EPREFIX"]
20
14
21
# ===========================================================================
15
# ===========================================================================
22
# START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF
16
# START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF
(-)a/pym/portage/package/ebuild/doebuild.py (-3 / +1 lines)
Lines 36-42 from portage import auxdbkeys, bsd_chflags, \ Link Here
36
	_shell_quote, _unicode_decode, _unicode_encode
36
	_shell_quote, _unicode_decode, _unicode_encode
37
from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_ENV_DIR, \
37
from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_ENV_DIR, \
38
	EBUILD_SH_BINARY, INVALID_ENV_FILE, MISC_SH_BINARY, \
38
	EBUILD_SH_BINARY, INVALID_ENV_FILE, MISC_SH_BINARY, \
39
	EPREFIX, MACOSSANDBOX_PROFILE
39
	MACOSSANDBOX_PROFILE
40
from portage.data import portage_gid, portage_uid, secpass, \
40
from portage.data import portage_gid, portage_uid, secpass, \
41
	uid, userpriv_groups
41
	uid, userpriv_groups
42
from portage.dbapi.porttree import _parse_uri_map
42
from portage.dbapi.porttree import _parse_uri_map
Lines 230-236 def doebuild_environment(myebuild, mydo, myroot=None, settings=None, Link Here
230
		# due to how it's coded... Don't overwrite this so we can use it.
230
		# due to how it's coded... Don't overwrite this so we can use it.
231
		mysettings["PORTAGE_DEBUG"] = "1"
231
		mysettings["PORTAGE_DEBUG"] = "1"
232
232
233
	mysettings["EPREFIX"]  = EPREFIX
234
	mysettings["EBUILD"]   = ebuild_path
233
	mysettings["EBUILD"]   = ebuild_path
235
	mysettings["O"]        = pkg_dir
234
	mysettings["O"]        = pkg_dir
236
	mysettings.configdict["pkg"]["CATEGORY"] = cat
235
	mysettings.configdict["pkg"]["CATEGORY"] = cat
237
- 

Return to bug 395633