--- koan/utils.py | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/koan/utils.py b/koan/utils.py index 39e2b43..d0ba012 100644 --- a/koan/utils.py +++ b/koan/utils.py @@ -315,7 +315,8 @@ def check_dist(): Determines what distro we're running under. """ if os.path.exists("/etc/debian_version"): - return "debian" + import lsb_release + return lsb_release.get_distro_information()['ID'].lower() elif os.path.exists("/etc/SuSE-release"): return "suse" else: @@ -351,11 +352,12 @@ def os_release(): raise CX("failed to detect local OS version from /etc/redhat-release") elif check_dist() == "debian": - fd = open("/etc/debian_version") - parts = fd.read().split(".") - version = parts[0] - rest = parts[1] - make = "debian" + import lsb_release + release = lsb_release.get_distro_information()['RELEASE'] + return ("debian", release) + elif check_dist() == "ubuntu": + version = sub_process.check_output(("lsb_release","--release","--short")).rstrip() + make = "ubuntu" return (make, float(version)) elif check_dist() == "suse": fd = open("/etc/SuSE-release") -- 1.7.4.1