Merge b009287 into 545163a

chanzuckerberg · Aug 18, 2020 · 5ce24e4 · 5ce24e4
2 parents 545163a + b009287
commit 5ce24e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/WDL/_util.py b/WDL/_util.py
@@ -764,7 +764,7 @@ def flock(  # pyre-fixme
 
         :param filename: file to open & lock
         :param mode: open() mode, default: "r+b" if exclusive else "rb"
-        :param exclusive: True to open an exclusive lock (default: shared lock)p
+        :param exclusive: True to open an exclusive lock (default: shared lock)
         :param wait: True to wait as long as needed to obtain the lock, otherwise (default) raise
                      OSError if the lock isn't available immediately. Self-deadlock is possible;
                      see Python fcntl.flock docs for further details.

diff --git a/WDL/runtime/cache.py b/WDL/runtime/cache.py
@@ -194,7 +194,7 @@ def put_download(
         logger = logger.getChild("CallCache") if logger else self._logger
         ans = filename
         p = self.download_cacheable(uri)
-        if p:
+        if p and not (os.path.exists(p) and self._cfg["call_cache"].get_bool("get")):
             os.makedirs(os.path.dirname(p), exist_ok=True)
             os.rename(filename, p)
             logger.info(_("stored in download cache", uri=uri, cache_path=p))