From 62ccafde23f8e119473af00fb302b174365929a8 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 5 Aug 2014 14:18:16 +0300
Subject: [PATCH] Resolve issue #9: ImportError: No module named
 platformio.util

---
 HISTORY.rst                |  9 +++++++--
 platformio/builder/main.py | 13 +++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index b466dd2a..83461028 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,11 @@ Release History
 1.0.0 (?)
 ---------
 
+0.6.0 (?)
+---------
+
+* Fixed an issue ``ImportError: No module named platformio.util`` (`issue #9 <https://github.com/ivankravets/platformio/issues/9>`_)
+
 0.5.0 (2014-08-04)
 ------------------
 
@@ -15,8 +20,8 @@ Release History
   with external library (Adafruit CC3000)
 * Implemented ``platformio upgrade`` command and "auto-check" for the latest
   version (`issue #8 <https://github.com/ivankravets/platformio/issues/8>`_)
-* Fixed issue with "auto-reset" for Raspduino board (thanks `David Mills <https://github.com/g7uvw>`_ for testing)
-* Fixed bug with nested libs building (thanks `Antonio Vanegas <https://github.com/hpsaturn>`_ for testing)
+* Fixed an issue with "auto-reset" for Raspduino board
+* Fixed a bug with nested libs building
 
 0.4.0 (2014-07-31)
 ------------------
diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index b9c05390..97c0be78 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -1,13 +1,22 @@
 # Copyright (C) Ivan Kravets <me@ikravets.com>
 # See LICENSE for details.
 
+try:
+    from platformio.util import get_home_dir
+except ImportError:
+    import sys
+    for _path in sys.path:
+        if "platformio" in _path:
+            sys.path.insert(0, _path[:_path.rfind("platformio")-1])
+            break
+    from platformio.util import get_home_dir
+
 from os.path import isdir, join
 
 from SCons.Script import (DefaultEnvironment, Exit, SConscript,
                           SConscriptChdir, Variables)
 
-from platformio.util import (get_home_dir, get_pioenvs_dir, get_project_dir,
-                             get_source_dir)
+from platformio.util import get_pioenvs_dir, get_project_dir, get_source_dir
 
 # AllowSubstExceptions()