You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sv...@apache.org on 2017/02/16 00:18:12 UTC

[1/2] incubator-trafodion git commit: [TRAFODION-2479] pyinstaller - firewall status should not block the installation process

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master cc13c6cc5 -> 60fcb5457


[TRAFODION-2479] pyinstaller - firewall status should not block the installation process


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5b86a062
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5b86a062
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5b86a062

Branch: refs/heads/master
Commit: 5b86a0625913f1b811915e370053a08673e75550
Parents: 554cd32
Author: Eason <hf...@gmail.com>
Authored: Mon Feb 13 11:18:26 2017 +0800
Committer: Eason <hf...@gmail.com>
Committed: Mon Feb 13 11:18:26 2017 +0800

----------------------------------------------------------------------
 install/python-installer/db_install.py         | 4 ++--
 install/python-installer/scripts/traf_setup.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5b86a062/install/python-installer/db_install.py
----------------------------------------------------------------------
diff --git a/install/python-installer/db_install.py b/install/python-installer/db_install.py
index ffdb0b0..26a4ee7 100755
--- a/install/python-installer/db_install.py
+++ b/install/python-installer/db_install.py
@@ -42,7 +42,7 @@ except ImportError:
 from scripts import wrapper
 from scripts.common import DEF_PORT_FILE, DBCFG_FILE, USER_PROMPT_FILE, DBCFG_TMP_FILE, \
                            INSTALLER_LOC, Remote, Version, ParseHttp, ParseInI, ParseJson, \
-                           http_start, http_stop, format_output, err_m, expNumRe, run_cmd
+                           http_start, http_stop, format_output, err_m, expNumRe, run_cmd, info
 
 # init global cfgs for user input
 cfgs = defaultdict(str)
@@ -454,7 +454,7 @@ def user_input(options, prompt_mode=True, pwd=''):
         if content_dict['linux'] == 'N/A':
             log_err('Unsupported Linux version')
         if content_dict['firewall_status'] == 'Running':
-            log_err('Firewall should be stopped')
+            info('Firewall is running, please make sure the ports used by Trafodion are open')
         if content_dict['traf_status'] == 'Running':
             log_err('Trafodion process is found, please stop it first')
         if content_dict['hbase'] == 'N/A':

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5b86a062/install/python-installer/scripts/traf_setup.py
----------------------------------------------------------------------
diff --git a/install/python-installer/scripts/traf_setup.py b/install/python-installer/scripts/traf_setup.py
index a35ab93..c0b090c 100755
--- a/install/python-installer/scripts/traf_setup.py
+++ b/install/python-installer/scripts/traf_setup.py
@@ -32,7 +32,7 @@ from common import err, cmd_output, run_cmd
 def run():
     dbcfgs = json.loads(dbcfgs_json)
 
-    HOME_DIR = cmd_output('cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
+    HOME_DIR = cmd_output('sudo cat /etc/default/useradd |grep HOME |cut -d "=" -f 2').strip()
     if dbcfgs.has_key('home_dir'):
         HOME_DIR = dbcfgs['home_dir']
 


[2/2] incubator-trafodion git commit: Merge [TRAFODION-2479] PR-955 pyinstaller - firewall status

Posted by sv...@apache.org.
Merge [TRAFODION-2479] PR-955 pyinstaller - firewall status


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/60fcb545
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/60fcb545
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/60fcb545

Branch: refs/heads/master
Commit: 60fcb5457445bc430828321bf8f5703e9dc1a8bb
Parents: cc13c6c 5b86a06
Author: Steve Varnau <sv...@apache.org>
Authored: Thu Feb 16 00:17:07 2017 +0000
Committer: Steve Varnau <sv...@apache.org>
Committed: Thu Feb 16 00:17:07 2017 +0000

----------------------------------------------------------------------
 install/python-installer/db_install.py         | 4 ++--
 install/python-installer/scripts/traf_setup.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------