mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
lib/oe/lsb.py: Prioritize parsing of /etc/os-release
Moved parsing of /etc/os-release before parsing of /etc/SuSE-release as /etc/SuSE-release is deprecated in recent releases of OpenSuSE. Here is the quote from /etc/SuSE-release: /etc/SuSE-release is deprecated and will be removed in the future, use /etc/os-release instead (From OE-Core rev: b3852bebb850048389994993e3717e54020c662f) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
cbce06a172
commit
3acdd43b2f
+9
-8
@@ -37,14 +37,6 @@ def release_dict_file():
|
|||||||
if match:
|
if match:
|
||||||
data['DISTRIB_ID'] = match.group(1)
|
data['DISTRIB_ID'] = match.group(1)
|
||||||
data['DISTRIB_RELEASE'] = match.group(2)
|
data['DISTRIB_RELEASE'] = match.group(2)
|
||||||
elif os.path.exists('/etc/SuSE-release'):
|
|
||||||
data = {}
|
|
||||||
data['DISTRIB_ID'] = 'SUSE LINUX'
|
|
||||||
with open('/etc/SuSE-release') as f:
|
|
||||||
for line in f:
|
|
||||||
if line.startswith('VERSION = '):
|
|
||||||
data['DISTRIB_RELEASE'] = line[10:].rstrip()
|
|
||||||
break
|
|
||||||
elif os.path.exists('/etc/os-release'):
|
elif os.path.exists('/etc/os-release'):
|
||||||
data = {}
|
data = {}
|
||||||
with open('/etc/os-release') as f:
|
with open('/etc/os-release') as f:
|
||||||
@@ -53,6 +45,15 @@ def release_dict_file():
|
|||||||
data['DISTRIB_ID'] = line[5:].rstrip().strip('"')
|
data['DISTRIB_ID'] = line[5:].rstrip().strip('"')
|
||||||
if line.startswith('VERSION_ID='):
|
if line.startswith('VERSION_ID='):
|
||||||
data['DISTRIB_RELEASE'] = line[11:].rstrip().strip('"')
|
data['DISTRIB_RELEASE'] = line[11:].rstrip().strip('"')
|
||||||
|
elif os.path.exists('/etc/SuSE-release'):
|
||||||
|
data = {}
|
||||||
|
data['DISTRIB_ID'] = 'SUSE LINUX'
|
||||||
|
with open('/etc/SuSE-release') as f:
|
||||||
|
for line in f:
|
||||||
|
if line.startswith('VERSION = '):
|
||||||
|
data['DISTRIB_RELEASE'] = line[10:].rstrip()
|
||||||
|
break
|
||||||
|
|
||||||
except IOError:
|
except IOError:
|
||||||
return None
|
return None
|
||||||
return data
|
return data
|
||||||
|
|||||||
Reference in New Issue
Block a user