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

修改gs_check检查不是uos的错

Browse Source
This commit is contained in:
leiziwei 2023-11-08 14:29:29 +08:00
parent d369bbb7e4
commit 1d88a2aac9
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/gspylib/os/gsplatform.py
View File

@ -1736,7 +1736,7 @@ class LinuxPlatform(GenericPlatform):
prefixStr, packageVersion,
PAK_KYLIN,
BIT_VERSION, postfixStr))
elif distname in UOS or distname in UNIONTECH:
elif distname in UOS:
fileName = os.path.join(dirName, "./../../../",
"%s-%s-%s-%s.%s" % (
prefixStr, packageVersion,

6
script/local/LocalCheckOS.py
View File

@ -1908,11 +1908,7 @@ def CheckPlatformInfo():
data.bits)
g_logger.log("False %s %s" % (data.distname, platform_str))
return
elif (data.distname == "euleros" or data.distname == "openEuler" or data.distname == "FusionOS" or data.distname == "kylin"):
mixed_type = "%s" % data.distname
platform_str = "%s_%s_%s" % (data.distname, data.version, data.bits)
elif (data.distname == "uos" or data.distname == "uniontech"):
data.distname = "uos"
elif (data.distname == "euleros" or data.distname == "openEuler" or data.distname == "FusionOS" or data.distname == "kylin" or data.distname == "uos"):
mixed_type = "%s" % data.distname
platform_str = "%s_%s_%s" % (data.distname, data.version, data.bits)
elif (data.distname == "debian" or data.version == "buster/sid"):

4
script/os_platform/linux_platform.py
View File

@ -23,7 +23,7 @@ import os
from gspylib.common.ErrorCode import ErrorCode
from os_platform.common import REDHAT, PAK_REDHAT, BIT_VERSION, \
CENTOS, UOS, UNIONTECH, PAK_EULER, PAK_CENTOS, ASIANUX, SUSE, PAK_ASIANUX, \
CENTOS, UOS, PAK_EULER, PAK_CENTOS, ASIANUX, SUSE, PAK_ASIANUX, \
EULEROS, OPENEULER, KYLIN, PAK_OPENEULER, SUPPORT_WHOLE_PLATFORM_LIST,\
BLANK_SPACE, PAK_UBUNTU, DEBIAN, PAK_KYLIN, PAK_UOS, PAK_SUSE, PAK_DEBIAN, \
FUSIONOS, PAK_FUSIONOS
@ -213,7 +213,7 @@ class LinuxPlatform(object):
self.package_file_path(prefix_str, packageVersion, PAK_CENTOS, postfix_str)
]
elif distname == OPENEULER or distname == KYLIN or distname == UOS or distname == UNIONTECH:
elif distname == OPENEULER or distname == KYLIN or distname == UOS:
file_name_list = [
self.package_file_path(prefix_str, packageVersion, PAK_OPENEULER, postfix_str),
self.package_file_path(prefix_str, packageVersion, PAK_KYLIN, postfix_str),

11
script/os_platform/rhel_platform.py
View File

@ -168,10 +168,6 @@ class RHELPlatform(LinuxPlatform):
if ((bits == BIT_VERSION and
((dist_name.lower() == EULEROS and version[0:3] in
SUPPORT_EULEROS_VERSION_LIST) or
(dist_name.lower() == UOS and version[0:3] in
SUPPORT_UOS_VERSION_LIST) or
(dist_name.lower() == UNIONTECH and version[0:3] in
SUPPORT_UOS_VERSION_LIST) or
(dist_name.lower() in SUPPORT_RHEL_SERIES_PLATFORM_LIST and
version[0:3] in SUPPORT_RHEL_SERIES_VERSION_LIST)) or
(dist_name.lower() == OPENEULER) or
@ -179,6 +175,13 @@ class RHELPlatform(LinuxPlatform):
(dist_name.lower() == DEBIAN and version == "buster/sid")
)):
return dist_name.lower(), version[0:3]
elif((bits == BIT_VERSION and
((dist_name.lower() == UOS and version[0:3] in
SUPPORT_UOS_VERSION_LIST) or
(dist_name.lower() == UNIONTECH and version[0:3] in
SUPPORT_UOS_VERSION_LIST))
)):
return UOS, version[0:3]
else:
if dist_name.lower() == CENTOS and os.path.isfile(
os.path.join("/etc", "euleros-release")) and \