feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Merge pull request #53 from MrCustomizer/develop

Browse Source 
Fixing handling of relative library paths
This commit is contained in:
Ivan Kravets
2015-01-24 17:27:12 +02:00
parent 2820e5a243 ef76822773
commit 93273e922f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platformio/util.py
View File

@@ -4,7 +4,7 @@
import json import json
from os import name as os_name from os import name as os_name
from os import getcwd, getenv, listdir, makedirs, utime from os import getcwd, getenv, listdir, makedirs, utime
from os.path import dirname, expanduser, isdir, isfile, join, realpath from os.path import abspath, dirname, expanduser, isdir, isfile, join, realpath
from platform import system, uname from platform import system, uname
from subprocess import PIPE, Popen from subprocess import PIPE, Popen
@@ -53,9 +53,8 @@ def get_lib_dir():
config.has_option("platformio", "lib_dir")): config.has_option("platformio", "lib_dir")):
lib_dir = config.get("platformio", "lib_dir") lib_dir = config.get("platformio", "lib_dir")
if lib_dir.startswith("~"): if lib_dir.startswith("~"):
return expanduser(lib_dir) lib_dir = expanduser(lib_dir)
else: return abspath(lib_dir)
return lib_dir
except NotPlatformProject: except NotPlatformProject:
pass pass
return join(get_home_dir(), "lib") return join(get_home_dir(), "lib")