hcq/openGauss-OM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改子用户加载/etc/profile导致获取环境变量不对的问题

Browse Source
This commit is contained in:
zhang_xubo
2023-02-27 14:40:58 +08:00
parent a3b5486ec8
commit cace0407f8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
script/gspylib/threads/SshTool.py
View File

@ -393,7 +393,7 @@ class SshTool():
unpathpath = os.path.dirname(os.path.realpath(__file__)) unpathpath = os.path.dirname(os.path.realpath(__file__))
GPHOME = os.path.realpath(os.path.join(unpathpath, "../../../")) GPHOME = os.path.realpath(os.path.join(unpathpath, "../../../"))
else: else:
GPHOME = self.getGPHOMEPath(osProfile) GPHOME = self.getGPHOMEPath(userProfile)
psshpre = "python3 %s/script/gspylib/pssh/bin/pssh" % GPHOME psshpre = "python3 %s/script/gspylib/pssh/bin/pssh" % GPHOME
# clean result file # clean result file
@ -559,7 +559,7 @@ class SshTool():
unpathpath = os.path.dirname(os.path.realpath(__file__)) unpathpath = os.path.dirname(os.path.realpath(__file__))
GPHOME = os.path.realpath(os.path.join(unpathpath, "../../../")) GPHOME = os.path.realpath(os.path.join(unpathpath, "../../../"))
else: else:
GPHOME = self.getGPHOMEPath(osProfile) GPHOME = self.getGPHOMEPath(userProfile)
psshpre = "python3 %s/script/gspylib/pssh/bin/pssh" % GPHOME psshpre = "python3 %s/script/gspylib/pssh/bin/pssh" % GPHOME
if ssh_config: if ssh_config:
if os.path.exists(ssh_config) and os.path.isfile(ssh_config): if os.path.exists(ssh_config) and os.path.isfile(ssh_config):

2
script/local/PreInstallUtility.py
View File

@ -1128,6 +1128,8 @@ Common options:
self.logger.logExit( self.logger.logExit(
ErrorCode.GAUSS_514["GAUSS_51400"] % cmd + "Error: \n%s" % str( ErrorCode.GAUSS_514["GAUSS_51400"] % cmd + "Error: \n%s" % str(
output)) output))
if output:
output = output.splitlines()[-1]
if output == "1": if output == "1":
return return
fileList = os.listdir(upperDir) fileList = os.listdir(upperDir)