From 57b877f445e79d4c45261bf3fefa76b83dc25bc0 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 10 Sep 2015 20:31:26 +0300 Subject: [PATCH] Fix Cygwin disabling --- platformio/__main__.py | 4 ++++ platformio/util.py | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platformio/__main__.py b/platformio/__main__.py index d6674297..011f8549 100644 --- a/platformio/__main__.py +++ b/platformio/__main__.py @@ -3,6 +3,7 @@ from os import listdir from os.path import join +from platform import system from sys import exit as sys_exit from traceback import format_exc @@ -70,6 +71,9 @@ def process_result(ctx, result, force, caller): # pylint: disable=W0613 def main(): try: + if "cygwin" in system().lower(): + raise exception.CygwinEnvDetected() + # https://urllib3.readthedocs.org # /en/latest/security.html#insecureplatformwarning try: diff --git a/platformio/util.py b/platformio/util.py index d6657c15..f9ba07f9 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -115,10 +115,6 @@ def get_systype(): data = uname() type_ = data[0].lower() arch = data[4].lower() if data[4] else "" - - if "cygwin" in type_: - raise exception.CygwinEnvDetected() - return "%s_%s" % (type_, arch) if arch else type_