diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2021-02-10 22:51:36 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-02-11 20:08:00 +0000 |
| commit | 42d2e4a817581ae34931bad2f5354dcd46f05dc5 (patch) | |
| tree | 50ca5af9af10824d122b873aad7c90904cec9674 | |
| parent | 3b4f12abc5d118ea461c4613b7d2475f6c4284cf (diff) | |
| download | mongo-42d2e4a817581ae34931bad2f5354dcd46f05dc5.tar.gz | |
SERVER-54458 update vendored scons to use uuid instead of pid for cachedir
| -rw-r--r-- | src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/CacheDir.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/CacheDir.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/CacheDir.py index 20a7df4b898..e6ddfac0a7e 100644 --- a/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/CacheDir.py +++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/CacheDir.py @@ -32,6 +32,7 @@ import json import os import stat import sys +import uuid import SCons import SCons.Action @@ -43,6 +44,7 @@ cache_debug = False cache_force = False cache_show = False cache_readonly = False +cache_tmp_uuid = uuid.uuid4().hex def CacheRetrieveFunc(target, source, env): t = target[0] @@ -104,7 +106,7 @@ def CachePushFunc(target, source, env): cd.CacheDebug('CachePush(%s): pushing to %s\n', t, cachefile) - tempfile = cachefile+'.tmp'+str(os.getpid()) + tempfile = f"{cachefile}.tmp{cache_tmp_uuid}" errfmt = "Unable to copy %s to cache. Cache file is %s" if not fs.isdir(cachedir): |