From db18c7d338f426c485e778d6e401af3f94c72c2b Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 7 Jun 2014 13:30:00 +0300
Subject: [PATCH] Moved "uploader" utility to separated tool folder

---
 platformio/builder/scripts/atmelavr.py | 4 ++--
 platformio/builder/scripts/timsp430.py | 2 +-
 platformio/builder/scripts/titiva.py   | 2 +-
 platformio/builder/tools/platformio.py | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platformio/builder/scripts/atmelavr.py b/platformio/builder/scripts/atmelavr.py
index 7aaa69c9..911e524f 100644
--- a/platformio/builder/scripts/atmelavr.py
+++ b/platformio/builder/scripts/atmelavr.py
@@ -47,13 +47,13 @@ env.Replace(
         "-mmcu=$BOARD_MCU"
     ],
 
-    UPLOADER="avrdude",
+    UPLOADER=join("$PLATFORMTOOLS_DIR", "avrdude", "avrdude"),
     UPLOADERFLAGS=[
         "-V",  # do not verify
         "-q",  # suppress progress output
         "-D",  # disable auto erase for flash memory
         "-p", "$BOARD_MCU",
-        "-C", join("$PLATFORMTOOLS_DIR", "toolchain", "etc", "avrdude.conf"),
+        "-C", join("$PLATFORMTOOLS_DIR", "avrdude", "avrdude.conf"),
         "-c", "$UPLOAD_PROTOCOL",
         "-b", "$UPLOAD_SPEED",
         "-P", "$UPLOAD_PORT"
diff --git a/platformio/builder/scripts/timsp430.py b/platformio/builder/scripts/timsp430.py
index f31745b8..ba11474a 100644
--- a/platformio/builder/scripts/timsp430.py
+++ b/platformio/builder/scripts/timsp430.py
@@ -47,7 +47,7 @@ env.Replace(
         "-Wl,-gc-sections,-u,main"
     ],
 
-    UPLOADER=(join("$PLATFORMTOOLS_DIR", "mspdebug", "mspdebug")),
+    UPLOADER=join("$PLATFORMTOOLS_DIR", "mspdebug", "mspdebug"),
     UPLOADERFLAGS=[
         "$UPLOAD_PROTOCOL",
         "--force-reset"
diff --git a/platformio/builder/scripts/titiva.py b/platformio/builder/scripts/titiva.py
index 0d0d6c9a..384b8037 100644
--- a/platformio/builder/scripts/titiva.py
+++ b/platformio/builder/scripts/titiva.py
@@ -69,7 +69,7 @@ env.Replace(
         "-fsingle-precision-constant"
     ],
 
-    UPLOADER="lm4flash",
+    UPLOADER=join("$PLATFORMTOOLS_DIR", "lm4flash", "lm4flash"),
     UPLOADCMD="$UPLOADER $SOURCES"
 )
 
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 80c7bd80..a9466ee0 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -42,7 +42,7 @@ def VariantDirRecursive(env, variant_dir, src_dir, duplicate=True):
     # add root dir by default
     variants = [variant_dir]
     env.VariantDir(variant_dir, src_dir, duplicate)
-    for root, dirnames, filenames in walk(env.subst(src_dir)):
+    for root, dirnames, _ in walk(env.subst(src_dir)):
         if not dirnames:
             continue
         for dn in dirnames:
@@ -95,7 +95,7 @@ def ResetDevice(env):
     s.close()
 
 
-def exists(env):
+def exists(_):
     return True