Attachment #133384 for bug #195771




        self.__d = {
            'config_protect'               : wrapper.config_protect,
            # Necessary to load the config file
            'my_etcconfig'                 : os.environ['EPREFIX'] + '/etc/vhosts/webapp-config',
            'my_dotconfig'                 : '.webapp',
            'my_version'                   : WCVERSION,
            'my_conf_version'              : '7',

            # -- wrobel
            'vhost_server_uid'  : 'root',
            'vhost_server_gid'  : 'root',
            'vhost_root'        : os.environ['EPREFIX'] + '/var/www/%(vhost_hostname)s',
            'g_htdocsdir'       : '%(vhost_root)s/%(my_htdocsbase)s',
            'my_appdir'         : '%(my_approot)s/%(my_appsuffix)s',
            'my_htdocsdir'      : '%(my_appdir)s/htdocs',

            'my_cgibindir'      : '%(my_hostrootdir)s/%(my_cgibinbase)s',
            'my_iconsdir'       : '%(my_hostrootdir)s/%(my_iconsbase)s',
            'my_errorsdir'      : '%(my_hostrootdir)s/%(my_errorsbase)s',
            'my_approot'        : os.environ['EPREFIX'] + '/usr/share/webapps',
            'my_appsuffix'      : '%(pn)s/%(pvr)s',
            'my_persistroot'    : os.environ['EPREFIX'] + '/var/db/webapps',
            'my_hostrootbase'   : 'hostroot',
            'my_cgibinbase'     : 'cgi-bin',
            'my_iconsbase'      : 'icons',

Lines 461-467 Link Here

(-)/Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/db.py (-1 / +1 lines)
461	'''	461	'''
462		462
463	def __init__(self,	463	def __init__(self,
464	root = '/usr/share/webapps',	464	root = os.environ['EPREFIX'] + '/usr/share/webapps',
465	package = '',	465	package = '',
466	version = '',	466	version = '',
467	installed = 'installed_by_webapp_eclass'):	467	installed = 'installed_by_webapp_eclass'):

Lines 40-46 Link Here

(-)/Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/sandbox.py (-1 / +1 lines)
40		40
41	self.config = config	41	self.config = config
42	self.__path = [config_libdir + '/libsandbox.so',	42	self.__path = [config_libdir + '/libsandbox.so',
43	'/usr/lib/libsandbox.so', '/lib/libsandbox.so']	43	os.environ['EPREFIX'] + '/usr/lib/libsandbox.so', os.environ['EPREFIX'] + '/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 52-58 Link Here

(-)/Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/wrapper.py (-1 / +1 lines)
52	# example, if ABI == 'amd64' then read LIBDIR_amd64. This routine should work on	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.	53	# all arches as it sets '/usr/lib' as a fallback. See bugs #125032 and #125156.
54		54
55	config_libdir = '/usr/lib'	55	config_libdir = os.environ['EPREFIX'] + '/usr/lib'
56		56
57	if 'ABI' in portage.settings.keys():	57	if 'ABI' in portage.settings.keys():
58	config_abi = portage.settings['ABI']	58	config_abi = portage.settings['ABI']

Return to bug 195771

Lines 206-212 Link Here

(-)/Gentoo/var/tmp/portage/app-admin/webapp-config-1.50.16-r2/work/webapp-config-1.50.16/WebappConfig/config.py (-4 / +4 lines)
206	self.__d = {	206	self.__d = {
207	'config_protect' : wrapper.config_protect,	207	'config_protect' : wrapper.config_protect,
208	# Necessary to load the config file	208	# Necessary to load the config file
209	'my_etcconfig' : '/etc/vhosts/webapp-config',	209	'my_etcconfig' : os.environ['EPREFIX'] + '/etc/vhosts/webapp-config',
210	'my_dotconfig' : '.webapp',	210	'my_dotconfig' : '.webapp',
211	'my_version' : WCVERSION,	211	'my_version' : WCVERSION,
212	'my_conf_version' : '7',	212	'my_conf_version' : '7',
Lines 248-254 Link Here
248	# -- wrobel	248	# -- wrobel
249	'vhost_server_uid' : 'root',	249	'vhost_server_uid' : 'root',
250	'vhost_server_gid' : 'root',	250	'vhost_server_gid' : 'root',
251	'vhost_root' : '/var/www/%(vhost_hostname)s',	251	'vhost_root' : os.environ['EPREFIX'] + '/var/www/%(vhost_hostname)s',
252	'g_htdocsdir' : '%(vhost_root)s/%(my_htdocsbase)s',	252	'g_htdocsdir' : '%(vhost_root)s/%(my_htdocsbase)s',
253	'my_appdir' : '%(my_approot)s/%(my_appsuffix)s',	253	'my_appdir' : '%(my_approot)s/%(my_appsuffix)s',
254	'my_htdocsdir' : '%(my_appdir)s/htdocs',	254	'my_htdocsdir' : '%(my_appdir)s/htdocs',
Lines 257-265 Link Here
257	'my_cgibindir' : '%(my_hostrootdir)s/%(my_cgibinbase)s',	257	'my_cgibindir' : '%(my_hostrootdir)s/%(my_cgibinbase)s',
258	'my_iconsdir' : '%(my_hostrootdir)s/%(my_iconsbase)s',	258	'my_iconsdir' : '%(my_hostrootdir)s/%(my_iconsbase)s',
259	'my_errorsdir' : '%(my_hostrootdir)s/%(my_errorsbase)s',	259	'my_errorsdir' : '%(my_hostrootdir)s/%(my_errorsbase)s',
260	'my_approot' : '/usr/share/webapps',	260	'my_approot' : os.environ['EPREFIX'] + '/usr/share/webapps',
261	'my_appsuffix' : '%(pn)s/%(pvr)s',	261	'my_appsuffix' : '%(pn)s/%(pvr)s',
262	'my_persistroot' : '/var/db/webapps',	262	'my_persistroot' : os.environ['EPREFIX'] + '/var/db/webapps',
263	'my_hostrootbase' : 'hostroot',	263	'my_hostrootbase' : 'hostroot',
264	'my_cgibinbase' : 'cgi-bin',	264	'my_cgibinbase' : 'cgi-bin',
265	'my_iconsbase' : 'icons',	265	'my_iconsbase' : 'icons',