Merge pull request #12690 from colindean/patch-1

Force UTF-8 encoding of lsb_release output
This commit is contained in:
Mike McQuaid 2022-01-10 13:05:01 +00:00 committed by GitHub
commit 65702a5a24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -12,7 +12,7 @@ module OS
def os_version def os_version
if which("lsb_release") if which("lsb_release")
lsb_info = Utils.popen_read("lsb_release", "-a") lsb_info = Utils.popen_read("lsb_release", "-a")
description = lsb_info[/^Description:\s*(.*)$/, 1] description = lsb_info[/^Description:\s*(.*)$/, 1].force_encoding("UTF-8")
codename = lsb_info[/^Codename:\s*(.*)$/, 1] codename = lsb_info[/^Codename:\s*(.*)$/, 1]
if codename.blank? || (codename == "n/a") if codename.blank? || (codename == "n/a")
description description