paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 17:36:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

provision: Include DISTRIB_FAMILY in parse_lsb_release output.

Browse Source
This commit is contained in:
rht
2019-01-06 01:28:02 +00:00
committed by Tim Abbott
parent d9ef3fd505
commit 15763f8545
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/lib/zulip_tools.py
View File

@@ -341,7 +341,8 @@ def parse_lsb_release():
codename = 'rhel' + info[6][0] # 7 codename = 'rhel' + info[6][0] # 7
distro_info = dict( distro_info = dict(
DISTRIB_CODENAME=codename, DISTRIB_CODENAME=codename,
DISTRIB_ID=vendor DISTRIB_ID=vendor,
DISTRIB_FAMILY='redhat',
) )
return distro_info return distro_info
try: try:
@@ -356,6 +357,7 @@ def parse_lsb_release():
# from lsb_release in the exception code path. # from lsb_release in the exception code path.
continue continue
distro_info[k] = v distro_info[k] = v
distro_info['DISTRIB_FAMILY'] = 'debian'
except FileNotFoundError: except FileNotFoundError:
# Unfortunately, Debian stretch doesn't yet have an # Unfortunately, Debian stretch doesn't yet have an
# /etc/lsb-release, so we instead fetch the pieces of data # /etc/lsb-release, so we instead fetch the pieces of data
@@ -364,7 +366,8 @@ def parse_lsb_release():
codename = subprocess_text_output(["lsb_release", "-cs"]) codename = subprocess_text_output(["lsb_release", "-cs"])
distro_info = dict( distro_info = dict(
DISTRIB_CODENAME=codename, DISTRIB_CODENAME=codename,
DISTRIB_ID=vendor DISTRIB_ID=vendor,
DISTRIB_FAMILY='debian',
) )
return distro_info return distro_info

2
tools/lib/provision.py
View File

@@ -120,7 +120,7 @@ if (not is_rhel_based) and (not os.path.exists("/usr/bin/lsb_release")):
distro_info = parse_lsb_release() distro_info = parse_lsb_release()
vendor = distro_info['DISTRIB_ID'] vendor = distro_info['DISTRIB_ID']
codename = distro_info['DISTRIB_CODENAME'] codename = distro_info['DISTRIB_CODENAME']
family = 'redhat' if vendor in ['CentOS', 'Fedora', 'RedHat'] else 'debian' family = distro_info['DISTRIB_FAMILY']
if not (vendor in SUPPORTED_PLATFORMS and codename in SUPPORTED_PLATFORMS[vendor]): if not (vendor in SUPPORTED_PLATFORMS and codename in SUPPORTED_PLATFORMS[vendor]):
logging.critical("Unsupported platform: {} {}".format(vendor, codename)) logging.critical("Unsupported platform: {} {}".format(vendor, codename))
sys.exit(1) sys.exit(1)