From d25f1ddc213e56bb666a43d133ff643d26f4e28f Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 31 May 2019 21:47:50 +0300 Subject: [PATCH] Add project folder prefix to $PROJECT_HASH --- platformio/project/helpers.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platformio/project/helpers.py b/platformio/project/helpers.py index c138cd8e..bf63f8b0 100644 --- a/platformio/project/helpers.py +++ b/platformio/project/helpers.py @@ -15,8 +15,8 @@ import os from hashlib import sha1 from os import walk -from os.path import (dirname, expanduser, isdir, isfile, join, realpath, - splitdrive) +from os.path import (basename, dirname, expanduser, isdir, isfile, join, + realpath, splitdrive) from platformio import __version__ from platformio.compat import PY2, WINDOWS @@ -53,9 +53,10 @@ def get_project_optional_dir(name, default=None): if "$PROJECT_HASH" in optional_dir: optional_dir = optional_dir.replace( - "$PROJECT_HASH", - sha1(project_dir if PY2 else project_dir.encode()).hexdigest() - [:10]) + "$PROJECT_HASH", "%s-%s" % + (basename(project_dir), + sha1(project_dir if PY2 else project_dir.encode()).hexdigest() + [:10])) if optional_dir.startswith("~"): optional_dir = expanduser(optional_dir)