[patch] Patch

portage.patch (text/plain), 1.53 KB, created by Arfrever Frehtes Taifersar Arahesis on 2019-05-13 15:21:02 UTC

From eae43ebbc307c9fa08a4e5de4b473c3eaa7ab83a Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Mon, 13 May 2019 17:15:03 +0200
Subject: [PATCH] portage.util._get_vm_info.get_vm_info: Set C locale for
 subprocesses.

Parsing of localized output of subprocesses would fail, making
`emerge --info` not display information about memory and swap.

Bug: https://bugs.gentoo.org/685854
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 lib/portage/util/_get_vm_info.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/portage/util/_get_vm_info.py b/lib/portage/util/_get_vm_info.py
index e8ad93805..802365dd7 100644
--- a/lib/portage/util/_get_vm_info.py
+++ b/lib/portage/util/_get_vm_info.py
@@ -1,4 +1,4 @@
-# Copyright 2013 Gentoo Foundation
+# Copyright 2013-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import os
@@ -11,10 +11,13 @@ def get_vm_info():
 
 	vm_info = {}
 
+	env = os.environ.copy()
+	env["LC_ALL"] = "C"
+
 	if platform.system() == 'Linux':
 		try:
 			proc = subprocess.Popen(["free"],
-				stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+				stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
 		except OSError:
 			pass
 		else:
@@ -49,7 +52,7 @@ def get_vm_info():
 
 		try:
 			proc = subprocess.Popen(["sysctl", "-a"],
-				stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+				stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
 		except OSError:
 			pass
 		else:
-- 
2.21.0