summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevan Franchini <twitch153@gentoo.org>2015-06-19 18:37:38 -0400
committerDevan Franchini <twitch153@gentoo.org>2015-06-19 18:37:40 -0400
commit831253e2f7554a701570b71bccc6e6b9507120c7 (patch)
tree09a7d955b7b2c64dc53760dc305be932c2c38196
parentconfig.py: Suppresses warning message for lack of -d flag for --query (diff)
downloadwebapp-config-831253e2f7554a701570b71bccc6e6b9507120c7.tar.gz
webapp-config-831253e2f7554a701570b71bccc6e6b9507120c7.tar.bz2
webapp-config-831253e2f7554a701570b71bccc6e6b9507120c7.zip
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.
-rw-r--r--WebappConfig/config.py8
1 files 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