diff options
| author |   Gunnar Wrobel <wrobel@gentoo.org> | 2007-04-27 22:14:49 +0000 |
|---|---|---|
| committer | Gunnar Wrobel <wrobel@gentoo.org> | 2007-04-27 22:14:49 +0000 |
| commit | ed86192fba579410e4895a207e359d095332617c (patch) | |
| tree | 9225e0ff156994a2bacbd01c2218617bc1ac57f2 | |
| parent | Fix for package_installed (diff) | |
| download | webapp-config-ed86192fba579410e4895a207e359d095332617c.tar.gz webapp-config-ed86192fba579410e4895a207e359d095332617c.tar.bz2 webapp-config-ed86192fba579410e4895a207e359d095332617c.zip | |
Do not use absolute path names by default
svn path=/trunk/webapp-config/; revision=41
| -rw-r--r-- | WebappConfig/config.py | 6 | ||||
| -rwxr-xr-x | config/webapp-config | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/WebappConfig/config.py b/WebappConfig/config.py index 2cae885..7a59e60 100644 --- a/WebappConfig/config.py +++ b/WebappConfig/config.py @@ -268,7 +268,8 @@ class Config: 'my_errorsdir' : '%(my_hostrootdir)s/%(my_errorsbase)s', 'g_cgibindir' : '%(vhost_root)s/%(my_cgibinbase)s', 'my_approot' : '/usr/share/webapps', - 'package_manager' : 'portage' + 'package_manager' : 'portage', + 'allow_absolute' : 'no', } # Setup basic defaults @@ -979,7 +980,8 @@ class Config: g_installdir = self.config.get('USER', 'g_installdir') - if os.path.isabs(g_installdir): + if (os.path.isabs(g_installdir) + and self.config.get('USER', 'allow_absolute') == 'yes'): installpath = g_installdir else: installpath = self.config.get('USER', 'g_htdocsdir') + '/' + g_installdir diff --git a/config/webapp-config b/config/webapp-config index e8dfe8b..532006c 100755 --- a/config/webapp-config +++ b/config/webapp-config @@ -183,6 +183,9 @@ vhost_perms_virtualowned_file="o-w" vhost_perms_installdir="0755" +# Allow specifying absolute path names using the -d option? +allow_absolute="no" + # Supported package managers: portage, paludis package_manager="portage" |