diff options
| author | Jim MacArthur <jim.macarthur@codethink.co.uk> | 2018-05-25 16:55:34 +0100 |
|---|---|---|
| committer | Jim MacArthur <jim@mode7.co.uk> | 2018-05-28 11:31:59 +0100 |
| commit | 165d0356fbbac4c4110ae1eb1e1e575a7720b18d (patch) | |
| tree | 59ad4265d594fa63a1f842537477451294cc2863 | |
| parent | a60224b7a6c9036e3e9f534d733e5bd0f7b731eb (diff) | |
| download | buildstream-165d0356fbbac4c4110ae1eb1e1e575a7720b18d.tar.gz | |
Remove some print debugging
| -rw-r--r-- | buildstream/storage/_casbaseddirectory.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py index 54adb179f..fd138caac 100644 --- a/buildstream/storage/_casbaseddirectory.py +++ b/buildstream/storage/_casbaseddirectory.py @@ -89,8 +89,6 @@ class CasBasedDirectory(Directory): with open(self._objpath(ref), 'rb') as f: self.directory.ParseFromString(f.read()) - else: - print("Creating a new CasBasedDirectory with the name {}".format(filename)) self.ref = ref self.index = OrderedDict() self.parent = parent @@ -131,6 +129,7 @@ class CasBasedDirectory(Directory): _objpath = self._objpath(digest) os.makedirs(os.path.dirname(_objpath), exist_ok=True) os.link(out.name, _objpath) + #print("Stored hash {}/{} in CAS".format(digest.hash, digest.size_bytes)) except FileExistsError as e: # We can ignore the failed link() if the object is already in the repo. @@ -150,6 +149,7 @@ class CasBasedDirectory(Directory): # Replace with tree read for entry in self.directory.directories: + print("Populate {}: directory entry {}".format(str(self), entry.name)) self.index[entry.name] = IndexEntry(CasBasedDirectory(self.context, ref=entry.digest,parent=self, filename=entry.name)) for entry in self.directory.files: self.index[entry.name] = IndexEntry(_FileObject(self, entry)) @@ -167,7 +167,7 @@ class CasBasedDirectory(Directory): self.parent.recalculate_hash(self) def _add_new_blank_directory(self, name): - print("Creating new CasBasedDirectory '{}', blank".format(name)) + #print("Creating new CasBasedDirectory '{}', blank".format(name)) newdir = CasBasedDirectory(self.context, parent=self, filename=name) dirnode = self.directory.directories.add() dirnode.name = name @@ -186,9 +186,8 @@ class CasBasedDirectory(Directory): if i.name == name: return i return None - def _add_directory(self, name): - print("Creating new CasBasedDirectory '{}', blank".format(name)) + #print("Creating new CasBasedDirectory '{}'".format(name)) if name in self.index: newdir = self.index[name].thing if not isinstance(newdir,CasBasedDirectory): @@ -214,7 +213,7 @@ class CasBasedDirectory(Directory): self._hash_object(digest=filenode.digest, path=os.path.join(basename, filename)) self.index[filename] = IndexEntry(_FileObject(basename, filename), modified=(filename in self.index)) self.recalculate_hash() - print(" Added file {} which now has hash {}".format(filename, filenode.digest.hash[0:7])) + #print(" Added file {} which now has hash {}".format(filename, filenode.digest.hash[0:7])) def _add_new_link(self, target, filename): symlinknode = self.directory.symlinks.add() @@ -222,7 +221,7 @@ class CasBasedDirectory(Directory): symlinknode.target = os.readlink(target) # But this may not be valid? self.index[filename] = IndexEntry(_LinkObject(target, filename), modified=(filename in self.index)) self.recalculate_hash() - print(" Added link {} to {}".format(filename, target)) + #print(" Added link {} to {}".format(filename, target)) def descend(self, subdirectory_spec: List[str], create: bool = False) -> Directory: @@ -280,7 +279,7 @@ class CasBasedDirectory(Directory): for name in sorted(os.listdir(source_directory)): pathname = os.path.join(source_directory, name) if os.path.isfile(pathname) and not os.path.islink(pathname): - print("Attempting to import FILE {} from {}".format(name, source_directory)) + #print("Attempting to import FILE {} from {}".format(name, source_directory)) self._add_new_file(source_directory, name) def save(self, name): |
