diff options
author | Jürg Billeter <j@bitron.ch> | 2019-02-01 11:28:31 +0000 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2019-02-13 11:48:45 +0100 |
commit | 353745a492102c96d7b2ca465c360836966f46ce (patch) | |
tree | e7e23696c4fd32bf2c5038faef8bbc048b3e908e | |
parent | 925429ea2e03576eaf8729fafd64f326f3b963a6 (diff) | |
download | buildstream-353745a492102c96d7b2ca465c360836966f46ce.tar.gz |
_casbaseddirectory.py: Return all directories in list_relative_paths()
This matches the change in utils.list_relative_paths().
-rw-r--r-- | buildstream/storage/_casbaseddirectory.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/buildstream/storage/_casbaseddirectory.py b/buildstream/storage/_casbaseddirectory.py index 09c8c9875..b6a39b83d 100644 --- a/buildstream/storage/_casbaseddirectory.py +++ b/buildstream/storage/_casbaseddirectory.py @@ -800,11 +800,11 @@ class CasBasedDirectory(Directory): directory_list = filter(lambda i: isinstance(i[1].buildstream_object, CasBasedDirectory), self.index.items()) - if file_list == [] and relpath != "": + if relpath != "": yield relpath - else: - for (k, v) in sorted(file_list): - yield os.path.join(relpath, k) + + for (k, v) in sorted(file_list): + yield os.path.join(relpath, k) for (k, v) in sorted(directory_list): yield from v.buildstream_object.list_relative_paths(relpath=os.path.join(relpath, k)) |