diff options
| author | Jürg Billeter <j@bitron.ch> | 2019-02-27 15:09:54 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2019-03-06 10:31:06 +0100 |
| commit | 5dc4066aa2ff4544490a8e1bfdddfe4af32b8d4a (patch) | |
| tree | 1aaf76632c6d4eb760b9b432cfc7480bc5a4c478 | |
| parent | e989f4a809a753529303cc0f5ff7e652fda37573 (diff) | |
| download | buildstream-5dc4066aa2ff4544490a8e1bfdddfe4af32b8d4a.tar.gz | |
_casbaseddirectory.py: Deduplicate os.path.join() calls in _add_file()
| -rw-r--r-- | buildstream/storage/_casbaseddirectory.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py index 9d1c8ab63..91e11888d 100644 --- a/buildstream/storage/_casbaseddirectory.py +++ b/buildstream/storage/_casbaseddirectory.py @@ -161,8 +161,9 @@ class CasBasedDirectory(Directory): def _add_file(self, basename, filename, modified=False): entry = IndexEntry(filename, _FileType.REGULAR_FILE, modified=modified or filename in self.index) - entry.digest = self.cas_cache.add_object(path=os.path.join(basename, filename)) - entry.is_executable = os.access(os.path.join(basename, filename), os.X_OK) + path = os.path.join(basename, filename) + entry.digest = self.cas_cache.add_object(path=path) + entry.is_executable = os.access(path, os.X_OK) self.index[filename] = entry self.__invalidate_digest() |