Added changelog after review
This commit is contained in:
parent
bbb47eedc0
commit
6dba96c8cc
3 changed files with 34 additions and 1 deletions
2
changelogs/fragments/49123-backport-devuan-support.yml
Normal file
2
changelogs/fragments/49123-backport-devuan-support.yml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- Backported support for Devuan-based distribution
|
|
@ -315,6 +315,15 @@ class DistributionFiles:
|
||||||
elif 'SteamOS' in data:
|
elif 'SteamOS' in data:
|
||||||
debian_facts['distribution'] = 'SteamOS'
|
debian_facts['distribution'] = 'SteamOS'
|
||||||
# nothing else to do, SteamOS gets correct info from python functions
|
# nothing else to do, SteamOS gets correct info from python functions
|
||||||
|
elif 'Devuan' in data:
|
||||||
|
debian_facts['distribution'] = 'Devuan'
|
||||||
|
release = re.search(r"PRETTY_NAME=[^(]+ \(?([^)]+?)\)", data)
|
||||||
|
if release:
|
||||||
|
debian_facts['distribution_release'] = release.groups()[0]
|
||||||
|
version = re.search(r"VERSION_ID=\"(.*)\"", data)
|
||||||
|
if version:
|
||||||
|
debian_facts['distribution_version'] = version.group(1)
|
||||||
|
debian_facts['distribution_major_version'] = version.group(1)
|
||||||
else:
|
else:
|
||||||
return False, debian_facts
|
return False, debian_facts
|
||||||
|
|
||||||
|
@ -414,7 +423,7 @@ class Distribution(object):
|
||||||
'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS',
|
'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS',
|
||||||
'OEL', 'Amazon', 'Virtuozzo', 'XenServer'],
|
'OEL', 'Amazon', 'Virtuozzo', 'XenServer'],
|
||||||
'Debian': ['Debian', 'Ubuntu', 'Raspbian', 'Neon', 'KDE neon',
|
'Debian': ['Debian', 'Ubuntu', 'Raspbian', 'Neon', 'KDE neon',
|
||||||
'Linux Mint', 'SteamOS'],
|
'Linux Mint', 'SteamOS', 'Devuan'],
|
||||||
'Suse': ['SuSE', 'SLES', 'SLED', 'openSUSE', 'openSUSE Tumbleweed',
|
'Suse': ['SuSE', 'SLES', 'SLED', 'openSUSE', 'openSUSE Tumbleweed',
|
||||||
'SLES_SAP', 'SUSE_LINUX', 'openSUSE Leap'],
|
'SLES_SAP', 'SUSE_LINUX', 'openSUSE Leap'],
|
||||||
'Archlinux': ['Archlinux', 'Antergos', 'Manjaro'],
|
'Archlinux': ['Archlinux', 'Antergos', 'Manjaro'],
|
||||||
|
|
|
@ -427,6 +427,28 @@ DISTRIB_DESCRIPTION="SteamOS 2.0"
|
||||||
'distribution_version': u'2.0'
|
'distribution_version': u'2.0'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
'name': "Devuan",
|
||||||
|
'input': {
|
||||||
|
'/etc/os-release': """PRETTY_NAME="Devuan GNU/Linux 1 (jessie)"
|
||||||
|
NAME="Devuan GNU/Linux"
|
||||||
|
VERSION_ID="1"
|
||||||
|
VERSION="1 (jessie)"
|
||||||
|
ID=devuan
|
||||||
|
HOME_URL="http://www.devuan.org/"
|
||||||
|
SUPPORT_URL="http://www.devuan.org/support/"
|
||||||
|
BUG_REPORT_URL="https://bugs.devuan.org/"
|
||||||
|
"""
|
||||||
|
},
|
||||||
|
'platform.dist': ('', '', ''),
|
||||||
|
'result': {
|
||||||
|
'distribution': u'Devuan',
|
||||||
|
'distribution_major_version': u'1',
|
||||||
|
'distribution_release': u'jessie',
|
||||||
|
'os_family': 'Debian',
|
||||||
|
'distribution_version': u'1'
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"platform.dist": [
|
"platform.dist": [
|
||||||
"Ubuntu",
|
"Ubuntu",
|
||||||
|
|
Loading…
Reference in a new issue