diff --git a/script/gspylib/threads/SshTool.py b/script/gspylib/threads/SshTool.py index dc21efcb874f7d874381b479cd93d2d825e639ec..f22c01b587d5d19135cc04d3361dcdffd6f866ae 100644 --- a/script/gspylib/threads/SshTool.py +++ b/script/gspylib/threads/SshTool.py @@ -393,7 +393,7 @@ class SshTool(): unpathpath = os.path.dirname(os.path.realpath(__file__)) GPHOME = os.path.realpath(os.path.join(unpathpath, "../../../")) else: - GPHOME = self.getGPHOMEPath(osProfile) + GPHOME = self.getGPHOMEPath(userProfile) psshpre = "python3 %s/script/gspylib/pssh/bin/pssh" % GPHOME # clean result file @@ -559,7 +559,7 @@ class SshTool(): unpathpath = os.path.dirname(os.path.realpath(__file__)) GPHOME = os.path.realpath(os.path.join(unpathpath, "../../../")) else: - GPHOME = self.getGPHOMEPath(osProfile) + GPHOME = self.getGPHOMEPath(userProfile) psshpre = "python3 %s/script/gspylib/pssh/bin/pssh" % GPHOME if ssh_config: if os.path.exists(ssh_config) and os.path.isfile(ssh_config): diff --git a/script/local/PreInstallUtility.py b/script/local/PreInstallUtility.py index f3ab9919a05971d89cfb1b1dda63ae2ff08bf07d..e374191e8dde533e62db7de45a35a5db519befd5 100644 --- a/script/local/PreInstallUtility.py +++ b/script/local/PreInstallUtility.py @@ -1128,6 +1128,8 @@ Common options: self.logger.logExit( ErrorCode.GAUSS_514["GAUSS_51400"] % cmd + "Error: \n%s" % str( output)) + if output: + output = output.splitlines()[-1] if output == "1": return fileList = os.listdir(upperDir)