commit 82189ab24fd6957b5e877a30ddefbfd5c9c1d0b1
author zhangqiang2 <zhangqiang2@zte.com.cn> Tue Feb 07 08:22:39 2017 -0500
committer Colm O hEigeartaigh <coheigea@apache.org> Wed Feb 08 09:44:41 2017 +0000
tree 285552802c9b4317a2452fa22ad43a1615d1781d
parent 8a398878a195b2bf2f260bd4019f544b0d6c30eb

RANGER-1356:The installer does not filter out comments lines for the configuration file when installing the Ranger UserSync Process and tagsync

Signed-off-by: Colm O hEigeartaigh <coheigea@apache.org>

tagsync/scripts/setup.py

diff --git a/tagsync/scripts/setup.py b/tagsync/scripts/setup.py
index 29369f7..88b10cc 100755
--- a/tagsync/scripts/setup.py
+++ b/tagsync/scripts/setup.py
@@ -104,9 +104,14 @@
     global globalDict
     read_config_file = open(os.path.join(RANGER_TAGSYNC_HOME,'install.properties'))
     for each_line in read_config_file.read().split('\n') :
-        if len(each_line) == 0 : continue
+        each_line = each_line.strip()
+        if len(each_line) == 0:
+            continue
+        elif each_line[0] == "#":
+            continue
+
         if re.search('=', each_line):
-            key , value = each_line.strip().split("=",1)
+            key , value = each_line.split("=",1)
             key = key.strip()
             value = value.strip()
             globalDict[key] = value

unixauthservice/scripts/setup.py

diff --git a/unixauthservice/scripts/setup.py b/unixauthservice/scripts/setup.py
index dc383af..b773e95 100755
--- a/unixauthservice/scripts/setup.py
+++ b/unixauthservice/scripts/setup.py
@@ -97,9 +97,13 @@
     global globalDict
     read_config_file = open(os.path.join(RANGER_USERSYNC_HOME,'install.properties'))
     for each_line in read_config_file.read().split('\n') :
-        if len(each_line) == 0 : continue
+        each_line = each_line.strip()
+        if len(each_line) == 0:
+            continue
+        elif each_line[0] == "#":
+            continue
         if re.search('=', each_line):
-            key , value = each_line.strip().split("=",1)
+            key , value = each_line.split("=",1)
             key = key.strip()
             if 'PASSWORD' in key:
                 jceks_file_path = os.path.join(RANGER_USERSYNC_HOME, 'jceks','ranger_db.jceks')