Refactor to use new protocol module and sipo.

[bertos.git] / wizard / toolchain_validation.py

diff --git a/wizard/toolchain_validation.py b/wizard/toolchain_validation.py
index 44ca6d41b1df5769899aa5f56d00e6071bcc07a4..a303a1b0e889826bd890831deb2d2eeb99e505af 100644 (file)
--- a/wizard/toolchain_validation.py
+++ b/wizard/toolchain_validation.py
@@ -28,7 +28,6 @@
 #
 # Copyright 2008 Develer S.r.l. (http://www.develer.com/)
 #
-# $Id$
 #
 # Author: Lorenzo Berni <duplo@develer.com>
 #
@@ -43,10 +42,12 @@ from const import TOOLCHAIN_ITEMS
 
 def validateToolchain(toolchain):
     if not os.path.exists(toolchain):
-        return False, {}
+        return {}
     for tool in TOOLCHAIN_ITEMS:
-        if not os.path.exists(toolchain.replace("gcc", tool)):
-            return False, {}
+        toolchainpre  = toolchain.rsplit("gcc", 1)[0]
+        toolchainpost = toolchain.rsplit("gcc", 1)[1]
+        if not os.path.exists(toolchainpre + tool + toolchainpost):
+            return {}
     validation_process = QProcess()
     validation_process.start(toolchain, ["-v"])
     validation_process.waitForStarted(1000)
@@ -54,9 +55,9 @@ def validateToolchain(toolchain):
         description = unicode(validation_process.readAllStandardError())
         info = bertos_utils.getToolchainInfo(description)
         if len(info) >= 4:
-            return True, info
+            return info
         else:
-            return False, {}
+            return {}
     else:
         validation_process.kill()
-        return False, {}
+        return {}