/[gentoo-x86]/app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch
Gentoo

Contents of /app-admin/webapp-config/files/webapp-config-1.50.16-absolute-paths.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Feb 17 18:06:03 2008 UTC (6 years, 2 months ago) by hollow
Branch: MAIN
CVS Tags: HEAD
fix #166853, #181938, #206669
(Portage version: 2.1.4.1)

1 Index: webapp-config-1.50.16/WebappConfig/config.py
2 ===================================================================
3 --- webapp-config-1.50.16.orig/WebappConfig/config.py
4 +++ webapp-config-1.50.16/WebappConfig/config.py
5 @@ -204,6 +204,7 @@ class Config:
6 pass
7
8 self.__d = {
9 + 'allow_absolute' : 'no',
10 'config_protect' : wrapper.config_protect,
11 # Necessary to load the config file
12 'my_etcconfig' : '/etc/vhosts/webapp-config',
13 @@ -870,8 +871,13 @@ class Config:
14 #
15 # this makes sure we don't write rubbish into the installs list
16
17 - installpath = self.config.get('USER', 'g_htdocsdir') + '/' + \
18 - self.config.get('USER', 'g_installdir')
19 + g_installdir = self.config.get('USER', 'g_installdir')
20 +
21 + if (os.path.isabs(g_installdir)
22 + and self.config.get('USER', 'allow_absolute') == 'yes'):
23 + installpath = g_installdir
24 + else:
25 + installpath = self.config.get('USER', 'g_htdocsdir') + '/' + g_installdir
26
27 installpath = re.compile('/+').sub('/', self.__root + installpath)
28
29 Index: webapp-config-1.50.16/config/webapp-config
30 ===================================================================
31 --- webapp-config-1.50.16.orig/config/webapp-config
32 +++ webapp-config-1.50.16/config/webapp-config
33 @@ -183,6 +183,9 @@ vhost_perms_virtualowned_file="o-w"
34
35 vhost_perms_installdir="0755"
36
37 +# Allow specifying absolute path names using the -d option?
38 +allow_absolute="no"
39 +
40
41 # ========================================================================
42 # END OF USER-EDITABLE SETTINGS

  ViewVC Help
Powered by ViewVC 1.1.20