Repository: ranger Updated Branches: refs/heads/master 543b9ff00 -> e16fd4c33
RANGER-1857:The value of RANGER_KMS_HOME logic is not correct in dba_script.py and db_setup.py, Like db_setup.py in admin, we should optimize them. Signed-off-by: zhangqiang2 <zhangqia...@zte.com.cn> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/e16fd4c3 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/e16fd4c3 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/e16fd4c3 Branch: refs/heads/master Commit: e16fd4c338fc318c26721107107b12f414df79a3 Parents: 543b9ff Author: peng.jianhua <peng.jian...@zte.com.cn> Authored: Wed Oct 25 10:30:37 2017 +0800 Committer: zhangqiang2 <zhangqia...@zte.com.cn> Committed: Thu Oct 26 20:42:57 2017 -0400 ---------------------------------------------------------------------- kms/scripts/db_setup.py | 9 +++------ kms/scripts/dba_script.py | 10 ++++------ 2 files changed, 7 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/e16fd4c3/kms/scripts/db_setup.py ---------------------------------------------------------------------- diff --git a/kms/scripts/db_setup.py b/kms/scripts/db_setup.py index fb89198..663d60d 100644 --- a/kms/scripts/db_setup.py +++ b/kms/scripts/db_setup.py @@ -34,12 +34,9 @@ is_unix = os_name == "LINUX" or os_name == "DARWIN" jisql_debug=True -if is_unix: - RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME") - if RANGER_KMS_HOME is None: - RANGER_KMS_HOME = os.getcwd() -elif os_name == "WINDOWS": - RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME") +RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME") +if RANGER_KMS_HOME is None: + RANGER_KMS_HOME = os.getcwd() def check_output(query): if is_unix: http://git-wip-us.apache.org/repos/asf/ranger/blob/e16fd4c3/kms/scripts/dba_script.py ---------------------------------------------------------------------- diff --git a/kms/scripts/dba_script.py b/kms/scripts/dba_script.py index c471f59..c0dc7a4 100755 --- a/kms/scripts/dba_script.py +++ b/kms/scripts/dba_script.py @@ -33,12 +33,10 @@ is_unix = os_name == "LINUX" or os_name == "DARWIN" jisql_debug=True masked_pwd_string='********' -if is_unix: - RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME") - if RANGER_KMS_HOME is None: - RANGER_KMS_HOME = os.getcwd() -elif os_name == "WINDOWS": - RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME") + +RANGER_KMS_HOME = os.getenv("RANGER_KMS_HOME") +if RANGER_KMS_HOME is None: + RANGER_KMS_HOME = os.getcwd() def check_output(query): if is_unix:
