Merge pull request #12690 from colindean/patch-1
Force UTF-8 encoding of lsb_release output
This commit is contained in:
commit
65702a5a24
@ -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
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user