Attachment #81555 for bug #125156

View | Details | Raw Unified | Return to bug 125156
Collapse All | Expand All

Lines 26-32 Link Here

(-)webapp-config-1.50.12.orig/WebappConfig/sandbox.py (-3 / +3 lines)
26		26
27	import os, string, time	27	import os, string, time
28		28
29	from WebappConfig.wrapper import config_abi	29	from WebappConfig.wrapper import config_libdir
30		30
31	from WebappConfig.debug import OUT	31	from WebappConfig.debug import OUT
32		32
Lines 39-46 Link Here
39	def __init__(self, config):	39	def __init__(self, config):
40		40
41	self.config = config	41	self.config = config
42	self.__path = ['/usr/lib/libsandbox.so', '/lib/libsandbox.so',	42	self.__path = [config_libdir + '/libsandbox.so',
43	config_abi + '/libsandbox.so']	43	'/usr/lib/libsandbox.so', '/lib/libsandbox.so']
44	self.__export = {}	44	self.__export = {}
45	self.__write = ['g_installdir',	45	self.__write = ['g_installdir',
46	'g_htdocsdir',	46	'g_htdocsdir',

Lines 47-56 Link Here

(-)webapp-config-1.50.12.orig/WebappConfig/wrapper.py (-2 / +11 lines)
47	# Variable for config protected files (used by protect.py)	47	# Variable for config protected files (used by protect.py)
48	config_protect = portage.settings['CONFIG_PROTECT']	48	config_protect = portage.settings['CONFIG_PROTECT']
49		49
		50	# Try to derive the correct libdir location by first examining the portage
		51	# variable ABI then using it to determine the appropriate variable to read. For
		52	# example, if ABI == 'amd64' then read LIBDIR_amd64. This routine should work on
		53	# all arches as it sets '/usr/lib' as a fallback. See bugs #125032 and #125156.
50	if 'ABI' in portage.settings.keys():	54	if 'ABI' in portage.settings.keys():
51	config_abi = portage.settings['ABI']	55	config_abi = portage.settings['ABI']
		56	if 'LIBDIR_' + config_abi in portage.settings.keys():
		57	config_libdir = '/usr/' + portage.settings['LIBDIR_' + config_abi]
		58	else:
		59	# This shouldn't happen but we want to know if it ever does
		60	OUT.die('Failed to determine libdir from portage.settings[\'LIBDIR_' + config_abi + '\']\n')
52	else:	61	else:
53	config_abi = '/usr/lib'	62	config_libdir = '/usr/lib'
54		63
55	protect_prefix = '._cfg'	64	protect_prefix = '._cfg'
56	update_command = 'etc-update'	65	update_command = 'etc-update'

Return to bug 125156