From bbb300eb229bcca0938b50fef9421f02b3b6d88b Mon Sep 17 00:00:00 2001
From: Joona Hoikkala <joona@kuori.org>
Date: Tue, 12 Apr 2016 14:27:00 +0300
Subject: [PATCH] Finalized parsing and fixed test case

---
 letsencrypt/le_util.py        | 16 ++++++++++++++++
 letsencrypt/tests/cli_test.py |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/letsencrypt/le_util.py b/letsencrypt/le_util.py
index 7ee5e33db..60cdd0314 100644
--- a/letsencrypt/le_util.py
+++ b/letsencrypt/le_util.py
@@ -217,6 +217,15 @@ def get_os_info():
     :rtype: `tuple` of `str`
     """
 
+    if os.path.isfile('/etc/os-release'):
+        # Systemd os-release parsing might be viable
+        os_name, os_version = get_systemd_os_info()
+        if os_name:
+            return (os_name, os_version)
+
+    # Fallback to platform module
+    return get_python_os_info()
+
 
 def get_systemd_os_info():
     """
@@ -233,6 +242,13 @@ def get_systemd_os_info():
 
 
 def _get_systemd_os_release_var(varname):
+    """
+    Get single value from systemd /etc/os-release
+
+    :param str varname: Name of variable to fetch
+    :returns: requested value
+    :rtype: `str`
+    """
 
     OS_RELEASE_FILEPATH = "/etc/os-release"
     var_string = varname+"="
diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py
index eb3f48308..03ad45514 100644
--- a/letsencrypt/tests/cli_test.py
+++ b/letsencrypt/tests/cli_test.py
@@ -169,7 +169,7 @@ class CLITest(unittest.TestCase):  # pylint: disable=too-many-public-methods
             import platform
             plat = platform.platform()
             if "linux" in plat.lower():
-                self.assertTrue(platform.linux_distribution()[0] in ua)
+                self.assertTrue(le_util.get_os_info()[0] in ua)
 
         with mock.patch('letsencrypt.main.client.acme_client.ClientNetwork') as acme_net:
             ua = "bandersnatch"