vpp_config: Update deprecated platform.linux_distribution()

platform.linux_distribution() was deprecated in python 3.5 and removed in 3.8.

update to use distro.linux_distribution().

>>> import platform
>>> platform.linux_distribution()
('Ubuntu', '16.04', 'xenial')

>>> import distro
>>> distro.linux_distribution()
('Ubuntu', '16.04', 'xenial')

Change-Id: Ia8a7cd2d78fd56145cdded0b9d361a1b45bb4d27
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:
Paul Vinciguerra
2019-04-30 21:15:18 -07:00
committed by Damjan Marion
parent b11c288f11
commit ef1ae3ad01
2 changed files with 9 additions and 8 deletions

View File

@ -17,11 +17,12 @@ from __future__ import print_function
import logging
import re
import subprocess
import platform
import requests
from collections import Counter
import distro
ubuntu_pkgs = {'release': ['vpp', 'vpp-plugins', 'vpp-api-java', 'vpp-api-lua', 'vpp-api-python',
'vpp-dbg', 'vpp-dev'],
'master': ['vpp', 'vpp-plugin-core', 'vpp-api-python',
@ -705,14 +706,14 @@ class VPPUtil(object):
:rtype: list
"""
distro = platform.linux_distribution()
if distro[0] == 'Ubuntu' or \
distro[0] == 'CentOS Linux' or \
distro[:7] == 'Red Hat':
return distro
dist = distro.linux_distribution()
if dist[0] == 'Ubuntu' or \
dist[0] == 'CentOS Linux' or \
dist[:7] == 'Red Hat':
return dist
else:
raise RuntimeError(
'Linux Distribution {} is not supported'.format(distro[0]))
'Linux Distribution {} is not supported'.format(dist[0]))
@staticmethod
def version():