rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb/linux.py: Workaround for Python >= 3.8

Browse Source 
The platform.dist() interface has been deprecated since Python 3.5, and
has been removed in Python 3.8.

Fixes:
Traceback (most recent call last):
  File "/home/anders/work/rtems/rsb/source-builder/sb/options.py", line 682, in load
    overrides = linux.load()
  File "/home/anders/work/rtems/rsb/source-builder/sb/linux.py", line 60, in load
    distro = platform.dist()[0]
AttributeError: module 'platform' has no attribute 'dist'

Signed-off-by: Anders Montonen <Anders.Montonen@iki.fi>
This commit is contained in:
Anders Montonen 2020-04-27 22:15:27 +03:00 committed by Chris Johns
parent 0c7965c093
commit ae9faa2726
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source-builder/sb/linux.py
View File

@ -55,13 +55,17 @@ def load():
'__tar': ('exe', 'required', '/bin/tar')
}
# Works for LSB distros
try:
distro = platform.dist()[0]
distro_ver = float(platform.dist()[1])
except ValueError:
# Non LSB distro found, use failover"
pass
# platform.dist() was removed in Python 3.8
if hasattr(platform, 'dist'):
# Works for LSB distros
try:
distro = platform.dist()[0]
distro_ver = float(platform.dist()[1])
except ValueError:
# Non LSB distro found, use failover"
pass
else:
distro = ''
# Non LSB - fail over to issue
if distro == '':