Fix firmware uploading for "atmelavr" boards which work within "usbtiny" protocol

HISTORY.rst

@@ -1,6 +1,13 @@
 Release History
 ===============
 
+1.0.2 (2015-03-??)
+------------------
+
+* Fixed firmware uploading for
+  `atmelavr <http://docs.platformio.org/en/latest/platforms/atmelavr.html#boards>`__
+  boards which work within ``usbtiny`` protocol
+
 1.0.1 (2015-02-27)
 ------------------
 

platformio/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (C) Ivan Kravets <me@ikravets.com>
 # See LICENSE for details.
 
-VERSION = (1, 1, "0-dev")
+VERSION = (1, 0, "2.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"

platformio/builder/scripts/atmelavr.py

@@ -20,15 +20,13 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
         with open(path, "w") as f:
             f.write(str(value))
 
-    if "UPLOAD_SPEED" in env:
-        env.Append(
-            UPLOADERFLAGS=["-b", "$UPLOAD_SPEED"]
-        )
-
     if "usb" not in env.subst("$UPLOAD_PROTOCOL"):
         env.AutodetectUploadPort()
         env.Append(
-            UPLOADERFLAGS=["-P", "$UPLOAD_PORT"]
+            UPLOADERFLAGS=[
+                "-b", "$UPLOAD_SPEED",
+                "-P", "$UPLOAD_PORT"
+            ]
         )
 
     if env.subst("$BOARD") == "raspduino":

platformio/builder/scripts/baseavr.py

@@ -50,11 +50,6 @@ env.Replace(
     SIZEPRINTCMD='"$SIZETOOL" --mcu=$BOARD_MCU -C -d $SOURCES'
 )
 
-if "UPLOAD_SPEED" in env:
-    env.Append(UPLOADERFLAGS=["-b", "$UPLOAD_SPEED"])
-if env.subst("$UPLOAD_PROTOCOL") != "usbtiny":
-    env.Append(UPLOADERFLAGS=["-P", "$UPLOAD_PORT"])
-
 env.Append(
     BUILDERS=dict(
         ElfToEep=Builder(