Skip to content

Commit

Permalink
[TRAFODION-2626] Fix pre-existing pyinstaller problem
Browse files Browse the repository at this point in the history
Change to TRAF_VAR exposed an issue in pyinstaller where a value
contained a shell variable that was not getting expanded.
  • Loading branch information
svarnau committed Jun 7, 2017
1 parent 6a9d368 commit ca5df28
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
12 changes: 6 additions & 6 deletions install/python-installer/scripts/traf_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import sys
import re
import json
from constants import DEF_HBASE_HOME, TRAF_SUDOER_FILE
from constants import DEF_HBASE_HOME, TRAF_SUDOER_FILE, TRAF_CFG_FILE
from common import err, cmd_output, run_cmd, get_default_home

def run():
Expand Down Expand Up @@ -73,11 +73,11 @@ def run():

### create and set permission for scratch file dir ###
for loc in scratch_locs:
# don't set permission for HOME folder
if not os.path.exists(loc):
run_cmd('mkdir -p %s' % loc)
if home_dir not in loc:
run_cmd('chmod 777 %s' % loc)
# expand any shell variables
locpath = cmd_output('source %s ; echo %s' % (TRAF_CFG_FILE,loc))
if not os.path.exists(locpath):
run_cmd('mkdir -p %s' % locpath)
run_cmd('chown %s %s' % (traf_user,locpath))

### copy jar files ###
hbase_lib_path = dbcfgs['hbase_lib_path']
Expand Down
1 change: 1 addition & 0 deletions install/python-installer/scripts/traf_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def run():
nodes = dbcfgs['node_list'].split(',')
trafodion_config = """
export TRAF_HOME="%s"
export TRAF_VAR=$TRAF_HOME/tmp
export MY_SQROOT=$TRAF_HOME # for compatibility
export JAVA_HOME="%s"
export NODE_LIST="%s"
Expand Down

0 comments on commit ca5df28

Please sign in to comment.