diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-03-20 20:37:12 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-22 09:29:44 +0000 |
| commit | b3852bebb850048389994993e3717e54020c662f (patch) | |
| tree | 3c39ef6cda6b4023c1a5c7983ba2872cf2ec2e5d | |
| parent | 747333764231d0320bdefbcf192b2589e70c58a1 (diff) | |
| download | openembedded-core-b3852bebb850048389994993e3717e54020c662f.tar.gz openembedded-core-b3852bebb850048389994993e3717e54020c662f.tar.bz2 openembedded-core-b3852bebb850048389994993e3717e54020c662f.zip | |
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
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/lsb.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/lib/oe/lsb.py b/meta/lib/oe/lsb.py index 50c1d4720b..ddfe71b6b5 100644 --- a/meta/lib/oe/lsb.py +++ b/meta/lib/oe/lsb.py @@ -37,14 +37,6 @@ def release_dict_file(): if match: data['DISTRIB_ID'] = match.group(1) 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'): data = {} with open('/etc/os-release') as f: @@ -53,6 +45,15 @@ def release_dict_file(): data['DISTRIB_ID'] = line[5:].rstrip().strip('"') if line.startswith('VERSION_ID='): 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: return None return data |