This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch traveltissues/mr4
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit bbab470fac99f518737e9a131befe29a5030ea01
Author: Darius Makovsky <traveltiss...@protonmail.com>
AuthorDate: Tue Dec 10 14:11:55 2019 +0000
_filebaseddirectory: support mtimes in `_import_files_from_cas`
_filebaseddirectory: don't update mtimes/hardlink if mtimes are provided
---
src/buildstream/storage/_filebaseddirectory.py | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/buildstream/storage/_filebaseddirectory.py
b/src/buildstream/storage/_filebaseddirectory.py
index d01b5ce..4c6c92f 100644
--- a/src/buildstream/storage/_filebaseddirectory.py
+++ b/src/buildstream/storage/_filebaseddirectory.py
@@ -123,7 +123,9 @@ class FileBasedDirectory(Directory):
report_written=report_written,
)
- if update_mtime:
+ # do not update times if these were set via nodes
+ properties = properties or []
+ if update_mtime and "MTime" not in properties:
cur_time = time.time()
for f in import_result.files_written:
@@ -296,7 +298,21 @@ class FileBasedDirectory(Directory):
if entry.type == _FileType.REGULAR_FILE:
src_path = source_directory.cas_cache.objpath(entry.digest)
- actionfunc(src_path, dest_path, result=result)
+
+ # fallback to copying if we require mtime support on this
file
+ if entry.node_properties:
+ utils.safe_copy(src_path, dest_path, result=result)
+ mtime = None
+ for prop in entry.node_properties:
+ if prop.name == "MTime" and prop.value:
+ mtime = prop.value
+ else:
+ raise ImplError("{} is not a supported node
property.".format(prop.name))
+ if mtime:
+ utils._set_file_mtime(dest_path, mtime)
+ else:
+ utils.safe_link(src_path, dest_path, result=result)
+
if entry.is_executable:
os.chmod(
dest_path,
@@ -308,6 +324,7 @@ class FileBasedDirectory(Directory):
| stat.S_IROTH
| stat.S_IXOTH,
)
+
else:
assert entry.type == _FileType.SYMLINK
os.symlink(entry.target, dest_path)
