commit: 831253e2f7554a701570b71bccc6e6b9507120c7
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 22:37:38 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 22:37:40 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=831253e2
config.py: Moves setting of g_orig_installdir to allow lack of -d flag
If this is not moved the .webapp file will not have WEB_INSTALLDIR
properly set when running "webapp-config -I <PN> <PVR>" which causes
issues when trying to uninstall the webapp.
WebappConfig/config.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index cb9d552..6c915c3 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -933,10 +933,6 @@ class Config:
OUT.set_info_level(1)
- # store original installdir
- self.config.set('USER', 'g_orig_installdir',
- self.config.get('USER', 'g_installdir'))
-
# Provide simple subdomain support
self.split_hostname()
@@ -1023,6 +1019,10 @@ class Config:
self.config.set('USER', 'g_installdir', pn)
self.flag_dir = True
+ # store original installdir
+ self.config.set('USER', 'g_orig_installdir',
+ self.config.get('USER', 'g_installdir'))
+
# --------------------------------------------------------------------
# Helper functions
