Merge pull request #149 from google/update-dep-1554385599

Update subpar dependency
google · Apr 4, 2019 · da03b39 · da03b39
2 parents 5b4a2cd + 3e885ef
commit da03b39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/client/v2_2/save_.py b/client/v2_2/save_.py
@@ -238,11 +238,12 @@ def valid(cached_layer, digest):
           lambda blob: blob[7:].encode('utf8'),
           blob)
       future_to_params[f] = digest_name
+      digest_str = str(digest)
 
       if cache_directory:
         # Search for a local cached copy
-        cached_layer = os.path.join(cache_directory, digest)
-        if os.path.exists(cached_layer) and valid(cached_layer, digest):
+        cached_layer = os.path.join(cache_directory, digest_str)
+        if os.path.exists(cached_layer) and valid(cached_layer, digest_str):
           f = executor.submit(link, cached_layer, layer_name)
           future_to_params[f] = layer_name
         else:

diff --git a/def.bzl b/def.bzl
@@ -93,5 +93,5 @@ py_library(
     git_repository(
         name = "subpar",
         remote = "https://github.com/google/subpar",
-        commit = "07ff5feb7c7b113eea593eb6ec50b51099cf0261",
+        commit = "0356bef3fbbabec5f0e196ecfacdeb6db62d48c0",  # 2019-03-07
     )