summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim MacArthur <jim.macarthur@codethink.co.uk>2018-09-16 10:56:30 +0100
committerJim MacArthur <jim.macarthur@codethink.co.uk>2018-09-19 16:16:28 +0100
commit4bdf5121b985b65bf55c719f211bcb50faac906d (patch)
tree788847e14e6f9d92f23f049441563aa4835b4066
parentda05ab8e6390421e5bf2bdf5ecf114f267835eb5 (diff)
downloadbuildstream-4bdf5121b985b65bf55c719f211bcb50faac906d.tar.gz
Fixes to print statements - only use generator once
-rw-r--r--buildstream/storage/_casbaseddirectory.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py
index 5a811bb32..6da605e40 100644
--- a/buildstream/storage/_casbaseddirectory.py
+++ b/buildstream/storage/_casbaseddirectory.py
@@ -572,8 +572,8 @@ class CasBasedDirectory(Directory):
else:
source_directory = external_pathspec
if files is None:
- files = list_relative_paths(source_directory)
- print("Performing import from plain directory {}, containing {} files.".format(source_directory, len(list(files))))
+ files = list(list_relative_paths(source_directory))
+ print("Performing import from plain directory {}, containing {} files: {}".format(source_directory, len(files), files))
result = self._import_files_from_directory(source_directory, files=files)
# TODO: No notice is taken of report_written, update_utimes or can_link.
@@ -591,7 +591,7 @@ class CasBasedDirectory(Directory):
if duplicate_cas:
if duplicate_cas.ref.hash != self.ref.hash:
raise VirtualDirectoryError("Mismatch between file-imported result {} and cas-to-cas imported result {}.".format(duplicate_cas.ref.hash,self.ref.hash))
-
+ print("Import complete; new hash is {}".format(self.ref.hash))
return result
def set_deterministic_mtime(self):