diff --git a/platformio/__init__.py b/platformio/__init__.py index adf23bc5..3573fb8e 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -VERSION = (2, 6, 3) +VERSION = (2, 6, "4.dev0") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/util.py b/platformio/util.py index 6b3a8557..8ace7aa7 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -364,11 +364,17 @@ def test_scons(): def install_scons(): - r = exec_command(["pip", "install", "-U", "scons"]) - if r['returncode'] != 0: - r = exec_command(["pip", "install", "--egg", "scons", - '--install-option="--no-install-man"']) - return r['returncode'] == 0 + cmds = ( + ["pip", "install", "-U", "scons"], + ["pip", "install", "--egg", "scons", + '--install-option="--no-install-man"'], + ["easy_install", "scons"] + ) + for cmd in cmds: + r = exec_command(cmd) + if r['returncode'] == 0: + return True + return False def scons_in_pip():