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

支持CentOS && Python3.7安装

Browse Source
This commit is contained in:
deadsec
2020-10-26 21:06:56 +08:00
parent 13b34b53cd
commit ac29de2cde
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/package.sh
View File

@ -569,8 +569,7 @@ function make_package_srv()
cp -rf ${BINARYLIBS_PATH}/install_tools/ipaddress.py ${BUILD_DIR}/temp/script/gspylib/inspection/lib/ cp -rf ${BINARYLIBS_PATH}/install_tools/ipaddress.py ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
cp -rf ${BINARYLIBS_PATH}/install_tools/six.py ${BUILD_DIR}/temp/script/gspylib/inspection/lib/ cp -rf ${BINARYLIBS_PATH}/install_tools/six.py ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
cp -rf ${BINARYLIBS_PATH}/install_tools/_cffi_backend.py ${BUILD_DIR}/temp/script/gspylib/inspection/lib/ cp -rf ${BINARYLIBS_PATH}/install_tools/_cffi_backend.py ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
cp -rf ${BINARYLIBS_PATH}/install_tools/_cffi_backend.so_UCS2 ${BUILD_DIR}/temp/script/gspylib/inspection/lib/ cp -rf ${BINARYLIBS_PATH}/install_tools/_cffi_backend.so* ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
cp -rf ${BINARYLIBS_PATH}/install_tools/_cffi_backend.so_UCS4 ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
cp -rf ${BINARYLIBS_PATH}/install_tools/psutil/ ${BUILD_DIR}/temp/script/gspylib/inspection/lib/ cp -rf ${BINARYLIBS_PATH}/install_tools/psutil/ ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
cp -rf ${BINARYLIBS_PATH}/install_tools/netifaces/ ${BUILD_DIR}/temp/script/gspylib/inspection/lib/ cp -rf ${BINARYLIBS_PATH}/install_tools/netifaces/ ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
cp -rf ${BINARYLIBS_PATH}/install_tools/paramiko/ ${BUILD_DIR}/temp/script/gspylib/inspection/lib/ cp -rf ${BINARYLIBS_PATH}/install_tools/paramiko/ ${BUILD_DIR}/temp/script/gspylib/inspection/lib/
@ -590,8 +589,7 @@ function make_package_srv()
mv ./install_tools/ipaddress.py ./lib mv ./install_tools/ipaddress.py ./lib
mv ./install_tools/six.py ./lib mv ./install_tools/six.py ./lib
mv ./install_tools/_cffi_backend.py ./lib mv ./install_tools/_cffi_backend.py ./lib
mv ./install_tools/_cffi_backend.so_UCS2 ./lib mv ./install_tools/_cffi_backend.so* ./lib
mv ./install_tools/_cffi_backend.so_UCS4 ./lib
mv ./install_tools/paramiko ./lib mv ./install_tools/paramiko ./lib
mv ./install_tools/psutil ./lib mv ./install_tools/psutil ./lib
mv ./install_tools/netifaces ./lib mv ./install_tools/netifaces ./lib

23
src/manager/om/script/gspylib/common/Common.py
View File

@ -926,10 +926,7 @@ class DefaultValue():
if (str(minor) == '6'): if (str(minor) == '6'):
return (True, "3.6") return (True, "3.6")
else: else:
if (int(patchlevel) < 9): return (True, "3.7")
return (True, "3.6")
else:
return (True, "3.7")
else: else:
return (False, "%s.%s.%s" % (str(major), str(minor), return (False, "%s.%s.%s" % (str(major), str(minor),
str(patchlevel))) str(patchlevel)))
@ -1059,12 +1056,20 @@ class DefaultValue():
g_file.removeFile(omToolsCffiPath) g_file.removeFile(omToolsCffiPath)
g_file.removeFile(inspectToolsCffiPath) g_file.removeFile(inspectToolsCffiPath)
# copy the correct version # copy the correct version
newPythonDependCryptoPath = "%s_UCS%d" % (omToolsCffiPath, newPythonDependCryptoPath = "%s_UCS%d_%s" % (omToolsCffiPath,
flagNum,version)
if os.path.exists(newPythonDependCryptoPath):
g_file.cpFile(newPythonDependCryptoPath, omToolsCffiPath,
"shell")
g_file.cpFile(newPythonDependCryptoPath, inspectToolsCffiPath,
"shell")
else:
newPythonDependCryptoPath = "%s_UCS%d" % (omToolsCffiPath,
flagNum) flagNum)
g_file.cpFile(newPythonDependCryptoPath, omToolsCffiPath, g_file.cpFile(newPythonDependCryptoPath, omToolsCffiPath,
"shell") "shell")
g_file.cpFile(newPythonDependCryptoPath, inspectToolsCffiPath, g_file.cpFile(newPythonDependCryptoPath, inspectToolsCffiPath,
"shell") "shell")
except Exception as e: except Exception as e:
print(ErrorCode.GAUSS_516["GAUSS_51632"] % print(ErrorCode.GAUSS_516["GAUSS_51632"] %
("config depend file for paramiko 2.6.0. " ("config depend file for paramiko 2.6.0. "