Jürg Billeter pushed to branch master at BuildStream / buildstream
Commits:
-
12719f0d
by Jürg Billeter at 2018-10-22T17:05:41Z
-
a7a28d14
by Jürg Billeter at 2018-10-22T17:05:41Z
-
be29e0f5
by Jürg Billeter at 2018-10-22T17:53:26Z
2 changed files:
Changes:
| ... | ... | @@ -228,7 +228,7 @@ class ArtifactCache(): |
| 228 | 228 |
self._required_elements.update(elements)
|
| 229 | 229 |
|
| 230 | 230 |
# For the cache keys which were resolved so far, we bump
|
| 231 |
- # the atime of them.
|
|
| 231 |
+ # the mtime of them.
|
|
| 232 | 232 |
#
|
| 233 | 233 |
# This is just in case we have concurrent instances of
|
| 234 | 234 |
# BuildStream running with the same artifact cache, it will
|
| ... | ... | @@ -240,7 +240,7 @@ class ArtifactCache(): |
| 240 | 240 |
for key in (strong_key, weak_key):
|
| 241 | 241 |
if key:
|
| 242 | 242 |
try:
|
| 243 |
- self.update_atime(key)
|
|
| 243 |
+ self.update_mtime(element, key)
|
|
| 244 | 244 |
except ArtifactError:
|
| 245 | 245 |
pass
|
| 246 | 246 |
|
| ... | ... | @@ -391,15 +391,16 @@ class ArtifactCache(): |
| 391 | 391 |
def preflight(self):
|
| 392 | 392 |
pass
|
| 393 | 393 |
|
| 394 |
- # update_atime()
|
|
| 394 |
+ # update_mtime()
|
|
| 395 | 395 |
#
|
| 396 |
- # Update the atime of an artifact.
|
|
| 396 |
+ # Update the mtime of an artifact.
|
|
| 397 | 397 |
#
|
| 398 | 398 |
# Args:
|
| 399 |
+ # element (Element): The Element to update
|
|
| 399 | 400 |
# key (str): The key of the artifact.
|
| 400 | 401 |
#
|
| 401 |
- def update_atime(self, key):
|
|
| 402 |
- raise ImplError("Cache '{kind}' does not implement contains()"
|
|
| 402 |
+ def update_mtime(self, element, key):
|
|
| 403 |
+ raise ImplError("Cache '{kind}' does not implement update_mtime()"
|
|
| 403 | 404 |
.format(kind=type(self).__name__))
|
| 404 | 405 |
|
| 405 | 406 |
# initialize_remotes():
|
| ... | ... | @@ -538,8 +538,9 @@ class CASCache(ArtifactCache): |
| 538 | 538 |
except FileNotFoundError as e:
|
| 539 | 539 |
raise ArtifactError("Attempt to access unavailable artifact: {}".format(e)) from e
|
| 540 | 540 |
|
| 541 |
- def update_atime(self, ref):
|
|
| 541 |
+ def update_mtime(self, element, key):
|
|
| 542 | 542 |
try:
|
| 543 |
+ ref = self.get_artifact_fullname(element, key)
|
|
| 543 | 544 |
os.utime(self._refpath(ref))
|
| 544 | 545 |
except FileNotFoundError as e:
|
| 545 | 546 |
raise ArtifactError("Attempt to access unavailable artifact: {}".format(e)) from e
|
