1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSysInfo: fall back to /usr/lib/os-release if the /etc one is missing

Browse Source 
Turns out that there are two files and while a lot of distros symlink
one to the other, some distros lack the one in /etc.

[ChangeLog][QtCore][QSysInfo] Fixed QSysInfo::productType() to properly
detect some Linux distributions that ship with a minimal /etc.

Change-Id: Ia741b559c24d46c78fb2fffd1548cab414037220
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Thiago Macieira 2018-08-07 20:22:27 -07:00
parent 25feee4e06
commit 58b6b723de
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/corelib/global/qglobal.cpp
View File

@ -2211,10 +2211,19 @@ static bool readEtcFile(QUnixOSVersion &v, const char *filename,
return true; return true;
} }
static bool readEtcOsRelease(QUnixOSVersion &v) static bool readOsRelease(QUnixOSVersion &v)
{ {
return readEtcFile(v, "/etc/os-release", QByteArrayLiteral("ID="), QByteArray id = QByteArrayLiteral("ID=");
QByteArrayLiteral("VERSION_ID="), QByteArrayLiteral("PRETTY_NAME=")); QByteArray versionId = QByteArrayLiteral("VERSION_ID=");
QByteArray prettyName = QByteArrayLiteral("PRETTY_NAME=");
// man os-release(5) says:
// The file /etc/os-release takes precedence over /usr/lib/os-release.
// Applications should check for the former, and exclusively use its data
// if it exists, and only fall back to /usr/lib/os-release if it is
// missing.
return readEtcFile(v, "/etc/os-release", id, versionId, prettyName) ||
readEtcFile(v, "/usr/lib/os-release", id, versionId, prettyName);
} }
static bool readEtcLsbRelease(QUnixOSVersion &v) static bool readEtcLsbRelease(QUnixOSVersion &v)
@ -2296,7 +2305,7 @@ static bool readEtcDebianVersion(QUnixOSVersion &v)
static bool findUnixOsVersion(QUnixOSVersion &v) static bool findUnixOsVersion(QUnixOSVersion &v)
{ {
if (readEtcOsRelease(v)) if (readOsRelease(v))
return true; return true;
if (readEtcLsbRelease(v)) if (readEtcLsbRelease(v))
return true; return true;