From 1412f085b8e54841c4dfd441f8d09bc2d51133f2 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Thu, 25 Jan 2018 18:12:36 +0200
Subject: [PATCH] Minor improvements

---
 platformio/builder/main.py              | 12 +-----------
 platformio/builder/tools/pioplatform.py |  9 +++++++++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index ef6be34a..9c8ad03b 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -183,16 +183,6 @@ if "idedata" in COMMAND_LINE_TARGETS:
             "http://docs.platformio.org/page/faq.html\n\n")
         env.Exit(1)
 
-
-def print_upload_protocols_info(  # pylint: disable=unused-argument
-        source, target, _):
-    selected = env.subst("$UPLOAD_PROTOCOL")
-    available = env.BoardConfig().get("upload", {}).get(
-        "protocols", [selected])
-    print "Available: %s" % ", ".join(available)
-    print "Selected: %s" % selected
-
-
 env.AddPreAction(["upload", "program"],
-                 Action(print_upload_protocols_info,
+                 Action(lambda source, target, env: env.PrintUploadInfo(),
                         "Configuring upload protocol..."))
diff --git a/platformio/builder/tools/pioplatform.py b/platformio/builder/tools/pioplatform.py
index 80fb5e67..a042b437 100644
--- a/platformio/builder/tools/pioplatform.py
+++ b/platformio/builder/tools/pioplatform.py
@@ -142,6 +142,14 @@ def PrintSystemInfo(env):
     print "Debug: %s" % " ".join(data)
 
 
+def PrintUploadInfo(env):
+    selected = env.subst("$UPLOAD_PROTOCOL")
+    available = env.BoardConfig().get("upload", {}).get(
+        "protocols", [selected])
+    print "Available: %s" % ", ".join(available)
+    print "Selected: %s" % selected
+
+
 def exists(_):
     return True
 
@@ -152,4 +160,5 @@ def generate(env):
     env.AddMethod(GetFrameworkScript)
     env.AddMethod(LoadPioPlatform)
     env.AddMethod(PrintSystemInfo)
+    env.AddMethod(PrintUploadInfo)
     return env