From 14db3287d37e31f54ccc6a94917cd62dd2b2ec0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Sat, 2 Feb 2019 05:46:54 +0100 Subject: projectconfig.yaml: Consistently include directories in split rules Most split rules already included the relevant directories themselves in addition to the directory contents. Add the missing bin, sbin, and libexec directories. This is required to fix tests with the following commit that changes list_relative_paths() to return all directories. --- buildstream/data/projectconfig.yaml | 6 ++++++ tests/cachekey/project/elements/build1.expected | 2 +- tests/cachekey/project/elements/build2.expected | 2 +- tests/cachekey/project/elements/compose1.expected | 2 +- tests/cachekey/project/elements/compose2.expected | 2 +- tests/cachekey/project/elements/compose3.expected | 2 +- tests/cachekey/project/elements/compose4.expected | 2 +- tests/cachekey/project/elements/compose5.expected | 2 +- tests/cachekey/project/elements/import1.expected | 2 +- tests/cachekey/project/elements/import2.expected | 2 +- tests/cachekey/project/elements/import3.expected | 2 +- tests/cachekey/project/elements/script1.expected | 2 +- tests/cachekey/project/sources/bzr1.expected | 2 +- tests/cachekey/project/sources/git1.expected | 2 +- tests/cachekey/project/sources/git2.expected | 2 +- tests/cachekey/project/sources/git3.expected | 2 +- tests/cachekey/project/sources/local1.expected | 2 +- tests/cachekey/project/sources/local2.expected | 2 +- tests/cachekey/project/sources/ostree1.expected | 2 +- tests/cachekey/project/sources/patch1.expected | 2 +- tests/cachekey/project/sources/patch2.expected | 2 +- tests/cachekey/project/sources/patch3.expected | 2 +- tests/cachekey/project/sources/pip1.expected | 2 +- tests/cachekey/project/sources/remote1.expected | 2 +- tests/cachekey/project/sources/remote2.expected | 2 +- tests/cachekey/project/sources/tar1.expected | 2 +- tests/cachekey/project/sources/tar2.expected | 2 +- tests/cachekey/project/sources/zip1.expected | 2 +- tests/cachekey/project/sources/zip2.expected | 2 +- tests/cachekey/project/target.expected | 2 +- 30 files changed, 35 insertions(+), 29 deletions(-) diff --git a/buildstream/data/projectconfig.yaml b/buildstream/data/projectconfig.yaml index 2a6b09a15..ee4055cf5 100644 --- a/buildstream/data/projectconfig.yaml +++ b/buildstream/data/projectconfig.yaml @@ -90,10 +90,16 @@ split-rules: # built element to run, this includes stripped executables # and shared libraries by default. runtime: + - | + %{bindir} - | %{bindir}/* + - | + %{sbindir} - | %{sbindir}/* + - | + %{libexecdir} - | %{libexecdir}/* - | diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected index 623a491e9..ffdaed644 100644 --- a/tests/cachekey/project/elements/build1.expected +++ b/tests/cachekey/project/elements/build1.expected @@ -1 +1 @@ -dadb8f86874f714b4f6d4c9025332934efb7e85c38f6a68b1267746ae8f43f24 +b9e1b6a714eb359dbb4b07a32a31c7142f94363c0806a924ca6c46fdbc2cfbea \ No newline at end of file diff --git a/tests/cachekey/project/elements/build2.expected b/tests/cachekey/project/elements/build2.expected index 34853b9ad..0c9eac627 100644 --- a/tests/cachekey/project/elements/build2.expected +++ b/tests/cachekey/project/elements/build2.expected @@ -1 +1 @@ -f81cefce283dd3581ba2fc865ff9c2763119274b114b12edb4e87196cfff8b2a +7260eb13fd926f3ef4cbc8bae7397f6ca0f3b37e871c14e1cf47e1d38f6fd68c \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected index 2bb7802d7..f3fcbd143 100644 --- a/tests/cachekey/project/elements/compose1.expected +++ b/tests/cachekey/project/elements/compose1.expected @@ -1 +1 @@ -36cb2ac57281343959266e87913eb690f4c68980d7267160ff5f071db778719d \ No newline at end of file +89fb02d35096d307e8480d25c73845c01ffecc625576a54455c9b29c387c9f16 \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected index 4b03402cb..b6067f117 100644 --- a/tests/cachekey/project/elements/compose2.expected +++ b/tests/cachekey/project/elements/compose2.expected @@ -1 +1 @@ -30ffe86750a497052f8fc868c47a08644cd579f8e86f59be9b04fa5530b6a9b6 \ No newline at end of file +414bb5723b2b88f3e70445651ad5c94dfe79a5e7e868527c5d74403d2b2c45d4 \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected index 5b975be25..2d602052c 100644 --- a/tests/cachekey/project/elements/compose3.expected +++ b/tests/cachekey/project/elements/compose3.expected @@ -1 +1 @@ -1bac1d17cc2aed85ab14daf264f955b2204823799bc5bac5ff77c79b32d0c08b \ No newline at end of file +9f0f67cc3a59b0f4e6ecd80f91b6998d5091ce73aa06700b9a45de869da5dd2c \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected index 48a96844a..fd7f774ee 100644 --- a/tests/cachekey/project/elements/compose4.expected +++ b/tests/cachekey/project/elements/compose4.expected @@ -1 +1 @@ -99690e3a915f4c5b6f76a5bcee8bffe74d077a4398ac29623be36bca26703290 \ No newline at end of file +5b18a8748410d3a4a340ebe368bde55ce4478d28b90e4d372733c77817e18532 \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected index 40287aa87..dea2db25b 100644 --- a/tests/cachekey/project/elements/compose5.expected +++ b/tests/cachekey/project/elements/compose5.expected @@ -1 +1 @@ -a3e25dabe35a2909920f94c9e457c977b00dfa49c161b82c47ad55e761349c6a \ No newline at end of file +49cae1de4f8b8836c67ad3d06d7cd68c1feb34410dc8e27a1e872f270c86affa \ No newline at end of file diff --git a/tests/cachekey/project/elements/import1.expected b/tests/cachekey/project/elements/import1.expected index ab07f28da..02a5f7534 100644 --- a/tests/cachekey/project/elements/import1.expected +++ b/tests/cachekey/project/elements/import1.expected @@ -1 +1 @@ -791aaae474dce95f98c849d748088697334a9b4bfcb6225c59804efe03e803c9 \ No newline at end of file +2fb0c6421eab90746ae724e0b0b4960591443e500225b75f1b71ceeaa61db8d8 \ No newline at end of file diff --git a/tests/cachekey/project/elements/import2.expected b/tests/cachekey/project/elements/import2.expected index 8b7327e20..f978f1a24 100644 --- a/tests/cachekey/project/elements/import2.expected +++ b/tests/cachekey/project/elements/import2.expected @@ -1 +1 @@ -3aaf0565ffbeb2faa4e48230d07ef839b9bc2ff012780ca9b5f6b9c968f539b2 \ No newline at end of file +9e7f024b39334d7d01f9984848daeab8866feb7e93b3a522e8f0b16959b9d63c \ No newline at end of file diff --git a/tests/cachekey/project/elements/import3.expected b/tests/cachekey/project/elements/import3.expected index 05cfbdf2e..57b409988 100644 --- a/tests/cachekey/project/elements/import3.expected +++ b/tests/cachekey/project/elements/import3.expected @@ -1 +1 @@ -7cadfb9b592af06fa765389278d919cb8e29515ad057710563da9cd1c36e2ce9 \ No newline at end of file +81f00ec3f3cc436b0feb2a9f3792f542c2e57659f3e5ccc68cba49d446b5dcd0 \ No newline at end of file diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected index 71a53906c..1b5bc4c03 100644 --- a/tests/cachekey/project/elements/script1.expected +++ b/tests/cachekey/project/elements/script1.expected @@ -1 +1 @@ -14db0665eed7c3d4cf3685c2e386a9e494465927a5ad962c98b92856be3d88b8 \ No newline at end of file +94d5397f23f35aa8d4b5b4e42c94de8901e08e0a973a8af7a5678f056beffefd \ No newline at end of file diff --git a/tests/cachekey/project/sources/bzr1.expected b/tests/cachekey/project/sources/bzr1.expected index debfe0c9d..68ef31975 100644 --- a/tests/cachekey/project/sources/bzr1.expected +++ b/tests/cachekey/project/sources/bzr1.expected @@ -1 +1 @@ -faadf63e4025e4a068532d01296b65db38dbf2c95625695832f7c601b2134375 \ No newline at end of file +5a8144078d50ff5507d7260c2aa7c62fc6272554767392cd827277e224385cb9 \ No newline at end of file diff --git a/tests/cachekey/project/sources/git1.expected b/tests/cachekey/project/sources/git1.expected index 5a98e679f..271faafdf 100644 --- a/tests/cachekey/project/sources/git1.expected +++ b/tests/cachekey/project/sources/git1.expected @@ -1 +1 @@ -3dc6b7c47ddb3ced44c42d22f4c192b9245112197172d2f9ce9498e4614bbca4 \ No newline at end of file +21968271111bb43e57417d24481742c2fe52fddd798af4aacca0f604c54b6b94 \ No newline at end of file diff --git a/tests/cachekey/project/sources/git2.expected b/tests/cachekey/project/sources/git2.expected index bfccc82c2..8abecc0c0 100644 --- a/tests/cachekey/project/sources/git2.expected +++ b/tests/cachekey/project/sources/git2.expected @@ -1 +1 @@ -3ded0e77f43c43f86920012d6ffe0e2f0cd98908ceab7023bf5a8d34bedf1d6e \ No newline at end of file +f3d0b8c1179f7b7a22beb4cef7b33a13af047bd882e7e3c34cea55c85dc0aae4 \ No newline at end of file diff --git a/tests/cachekey/project/sources/git3.expected b/tests/cachekey/project/sources/git3.expected index c0ab92c20..55b02f242 100644 --- a/tests/cachekey/project/sources/git3.expected +++ b/tests/cachekey/project/sources/git3.expected @@ -1 +1 @@ -31e95bdf97eb85d2261c988de7ee055e00c31a76199b495643661e5d1fbd195e \ No newline at end of file +d3c796a610f0ce13c7f4dc99ce5d0f0a8674c7bbd8c53de28248711b44d427a1 \ No newline at end of file diff --git a/tests/cachekey/project/sources/local1.expected b/tests/cachekey/project/sources/local1.expected index ab07f28da..02a5f7534 100644 --- a/tests/cachekey/project/sources/local1.expected +++ b/tests/cachekey/project/sources/local1.expected @@ -1 +1 @@ -791aaae474dce95f98c849d748088697334a9b4bfcb6225c59804efe03e803c9 \ No newline at end of file +2fb0c6421eab90746ae724e0b0b4960591443e500225b75f1b71ceeaa61db8d8 \ No newline at end of file diff --git a/tests/cachekey/project/sources/local2.expected b/tests/cachekey/project/sources/local2.expected index f59f4a7cf..1afe39f07 100644 --- a/tests/cachekey/project/sources/local2.expected +++ b/tests/cachekey/project/sources/local2.expected @@ -1 +1 @@ -e44b20eaec873dd28471963d789fbb5660eb14754b7711a5ab0d7785d3bffd37 \ No newline at end of file +102fd151a74be862cb6d72dd99b9227e8d5b136404c3d11fc7beb17c773a9c72 \ No newline at end of file diff --git a/tests/cachekey/project/sources/ostree1.expected b/tests/cachekey/project/sources/ostree1.expected index 7bfd2ee12..d3fb12439 100644 --- a/tests/cachekey/project/sources/ostree1.expected +++ b/tests/cachekey/project/sources/ostree1.expected @@ -1 +1 @@ -3b13c4a4b3adcfdf2b6bbbc8b74cc8f43cbfd39ec73af1b285bd8fef79a57068 \ No newline at end of file +8e9f5115d54df9feff28accf061f18b77458816897fdd841d7399bc0d5375633 \ No newline at end of file diff --git a/tests/cachekey/project/sources/patch1.expected b/tests/cachekey/project/sources/patch1.expected index 1a2a1a782..85cd460ec 100644 --- a/tests/cachekey/project/sources/patch1.expected +++ b/tests/cachekey/project/sources/patch1.expected @@ -1 +1 @@ -ffad4c89efdbcabb86aeea338b4d076f9f44dec2b7b0bc0e6ede39a0e792f992 \ No newline at end of file +52f6d22e92bb627d48f6957d0c55d57d0da5e228ea0d43d108283425b3cb13f4 \ No newline at end of file diff --git a/tests/cachekey/project/sources/patch2.expected b/tests/cachekey/project/sources/patch2.expected index 3a6812987..54636aa88 100644 --- a/tests/cachekey/project/sources/patch2.expected +++ b/tests/cachekey/project/sources/patch2.expected @@ -1 +1 @@ -5e91946c032a83120ae97a84f96dbfbf98992d6decff99df0073a117cd45702e \ No newline at end of file +1937060b2df8c11f37b031751beacdd28b471324734f372b970d29ba3d605b0d \ No newline at end of file diff --git a/tests/cachekey/project/sources/patch3.expected b/tests/cachekey/project/sources/patch3.expected index ba20eb320..bc3f10148 100644 --- a/tests/cachekey/project/sources/patch3.expected +++ b/tests/cachekey/project/sources/patch3.expected @@ -1 +1 @@ -bd55bfb2b546b57ac627ba7756269e5d64cb7a74c990e0ef66c06bd4dc3b44a3 \ No newline at end of file +cdccd2228c0329b99d22703aac874b4a3a78753adb759c4fae8add533e933d2f \ No newline at end of file diff --git a/tests/cachekey/project/sources/pip1.expected b/tests/cachekey/project/sources/pip1.expected index a85714052..7fcee4c9f 100644 --- a/tests/cachekey/project/sources/pip1.expected +++ b/tests/cachekey/project/sources/pip1.expected @@ -1 +1 @@ -09d873158f35ea64e67919373a6cfbd4aaba9321b817c89317b1350da8267318 \ No newline at end of file +24dcac92e44ef96217b625941d7571dd03fea4a86f34177e280ba9e3b20dea32 \ No newline at end of file diff --git a/tests/cachekey/project/sources/remote1.expected b/tests/cachekey/project/sources/remote1.expected index 2595e6f4c..f9ceb1bf3 100644 --- a/tests/cachekey/project/sources/remote1.expected +++ b/tests/cachekey/project/sources/remote1.expected @@ -1 +1 @@ -fc9d09695a6e04785671cc53e36dbc1dd1391a8bcd4a7003c5cce161f2a6c484 \ No newline at end of file +4eec6ce665ea7c970b4df61d2033dd5a49764e9e97855054c475c066fc29efc7 \ No newline at end of file diff --git a/tests/cachekey/project/sources/remote2.expected b/tests/cachekey/project/sources/remote2.expected index 1de8e1b76..cc235357c 100644 --- a/tests/cachekey/project/sources/remote2.expected +++ b/tests/cachekey/project/sources/remote2.expected @@ -1 +1 @@ -de35773c4cec65912e4cef18682a0fc176a49ee6637b0c5e8f68b546225c0865 \ No newline at end of file +15f1af6230e981740c7103f7b8327e53a74acbbcd40579fc9990bd39ae8f049a \ No newline at end of file diff --git a/tests/cachekey/project/sources/tar1.expected b/tests/cachekey/project/sources/tar1.expected index 7575b52b3..d61f558d4 100644 --- a/tests/cachekey/project/sources/tar1.expected +++ b/tests/cachekey/project/sources/tar1.expected @@ -1 +1 @@ -9e2e12cb32b52463fd324afe2f32b622ee76973cdefcb35e0a14c8d0ecf94604 \ No newline at end of file +3601b0102ce629bba95734d5136e4589348dde3d74402185777c2aef6ebe9c82 \ No newline at end of file diff --git a/tests/cachekey/project/sources/tar2.expected b/tests/cachekey/project/sources/tar2.expected index e2e8e36c1..40c46cf50 100644 --- a/tests/cachekey/project/sources/tar2.expected +++ b/tests/cachekey/project/sources/tar2.expected @@ -1 +1 @@ -08b95e17d08ac792e04df9d8165a00ee11520f022895cc6abafe379295a55fc3 \ No newline at end of file +9a1230d0f68187d35bd083115e545bc153b2b06879c661ac30a73a03f876ac01 \ No newline at end of file diff --git a/tests/cachekey/project/sources/zip1.expected b/tests/cachekey/project/sources/zip1.expected index faef2458b..04b82aadf 100644 --- a/tests/cachekey/project/sources/zip1.expected +++ b/tests/cachekey/project/sources/zip1.expected @@ -1 +1 @@ -590963540c16c9c462fbbed88d1c6bf9134e753c652e01710b81d6218bf348bb \ No newline at end of file +a00fbe9c48fcf071e2a84fb2e39d7939c13eac0f8b07262fb52b7746f0a6f160 \ No newline at end of file diff --git a/tests/cachekey/project/sources/zip2.expected b/tests/cachekey/project/sources/zip2.expected index 950b5002f..4c3e6e71e 100644 --- a/tests/cachekey/project/sources/zip2.expected +++ b/tests/cachekey/project/sources/zip2.expected @@ -1 +1 @@ -97dc236aa4f600cfbe6f5d7d47841f547ac6c6ee0e6b55275af8d3f1ec2cb68a \ No newline at end of file +fe0e42a62eba9f4f96016eb6b0a3807401e9f9f8ded3c1ec3e500a431de0e2eb \ No newline at end of file diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected index 66a38036e..36166fc72 100644 --- a/tests/cachekey/project/target.expected +++ b/tests/cachekey/project/target.expected @@ -1 +1 @@ -92dae6a712b4f91f4fdbdf8dad732cf07ff4da092a319fa4f4b261a9287640de +bf7a3412e8fcaaf76853bf73ace41ceca8944a598c777410cdee26a6d0e643be \ No newline at end of file -- cgit v1.2.1 From c7625cdfab71248ced7e4623b7fc1cf4ca97db52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Sat, 2 Feb 2019 05:48:43 +0100 Subject: tests/integration/project: Add tests directory to split rule This is required to fix tests with the following commit that changes list_relative_paths() to return all directories. --- tests/integration/project/project.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/integration/project/project.conf b/tests/integration/project/project.conf index 726f65686..ddfe47b6d 100644 --- a/tests/integration/project/project.conf +++ b/tests/integration/project/project.conf @@ -17,5 +17,7 @@ options: - aarch64 split-rules: test: + - | + /tests - | /tests/* -- cgit v1.2.1 From 925429ea2e03576eaf8729fafd64f326f3b963a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 1 Feb 2019 11:11:59 +0000 Subject: utils.py: Return all directories in list_relative_paths() Returning only empty directories leads to inconsistencies when computing a manifest by combining results from multiple list_relative_paths() calls as done by the compose plugin. I.e., the same directory may be empty in one dependency and non-empty in another dependency. The merged file list will still contain that directory even though it's no longer empty. This inconsistency causes problems when calculating differences between manifests. Returning all directories fixes these inconsistencies. This is a change in API behavior. --- buildstream/utils.py | 11 +++-------- tests/cachekey/project/elements/build1.expected | 2 +- tests/cachekey/project/elements/build2.expected | 2 +- tests/cachekey/project/elements/compose1.expected | 2 +- tests/cachekey/project/elements/compose2.expected | 2 +- tests/cachekey/project/elements/compose3.expected | 2 +- tests/cachekey/project/elements/compose4.expected | 2 +- tests/cachekey/project/elements/compose5.expected | 2 +- tests/cachekey/project/elements/import1.expected | 2 +- tests/cachekey/project/elements/import2.expected | 2 +- tests/cachekey/project/elements/import3.expected | 2 +- tests/cachekey/project/elements/script1.expected | 2 +- tests/cachekey/project/sources/local1.expected | 2 +- tests/cachekey/project/sources/local2.expected | 2 +- tests/cachekey/project/target.expected | 2 +- 15 files changed, 17 insertions(+), 22 deletions(-) diff --git a/buildstream/utils.py b/buildstream/utils.py index b739ca658..12407ba30 100644 --- a/buildstream/utils.py +++ b/buildstream/utils.py @@ -117,9 +117,6 @@ def list_relative_paths(directory): This generator is useful for checking the full manifest of a directory. - Note that directories will be yielded only if they are - empty. - Symbolic links will not be followed, but will be included in the manifest. @@ -156,11 +153,9 @@ def list_relative_paths(directory): # `directory`, prefer to have no prefix in that case. basepath = relpath if relpath != '.' and dirpath != directory else '' - # We've decended into an empty directory, in this case we - # want to include the directory itself, but not in any other - # case. - if not filenames: - yield relpath + # First yield the walked directory itself, except for the root + if basepath != '': + yield basepath # List the filenames in the walked directory for f in filenames: diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected index ffdaed644..c2982f939 100644 --- a/tests/cachekey/project/elements/build1.expected +++ b/tests/cachekey/project/elements/build1.expected @@ -1 +1 @@ -b9e1b6a714eb359dbb4b07a32a31c7142f94363c0806a924ca6c46fdbc2cfbea \ No newline at end of file +298bb7caab56c60bc12f59df15db2b1107a604fdb0ce3fa5729aa23d6d37f6e4 \ No newline at end of file diff --git a/tests/cachekey/project/elements/build2.expected b/tests/cachekey/project/elements/build2.expected index 0c9eac627..bc663989f 100644 --- a/tests/cachekey/project/elements/build2.expected +++ b/tests/cachekey/project/elements/build2.expected @@ -1 +1 @@ -7260eb13fd926f3ef4cbc8bae7397f6ca0f3b37e871c14e1cf47e1d38f6fd68c \ No newline at end of file +c745f07458a2488180ae7f5b0601a38853dcdfd2b6771c18ecbb622f1af10cf1 \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected index f3fcbd143..9abf5b751 100644 --- a/tests/cachekey/project/elements/compose1.expected +++ b/tests/cachekey/project/elements/compose1.expected @@ -1 +1 @@ -89fb02d35096d307e8480d25c73845c01ffecc625576a54455c9b29c387c9f16 \ No newline at end of file +d759c8b7262c4782c12b425bfca0bc8f4c30656d91c98e309c10f11d4179b101 \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected index b6067f117..4c3881b8e 100644 --- a/tests/cachekey/project/elements/compose2.expected +++ b/tests/cachekey/project/elements/compose2.expected @@ -1 +1 @@ -414bb5723b2b88f3e70445651ad5c94dfe79a5e7e868527c5d74403d2b2c45d4 \ No newline at end of file +01e22d37b82c9b35c35d3d8485e05fe6de526d3af00137bbff51a309b1fa3401 \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected index 2d602052c..e66de59f5 100644 --- a/tests/cachekey/project/elements/compose3.expected +++ b/tests/cachekey/project/elements/compose3.expected @@ -1 +1 @@ -9f0f67cc3a59b0f4e6ecd80f91b6998d5091ce73aa06700b9a45de869da5dd2c \ No newline at end of file +22b846d1928155b5a21497e8048af2945ee03a826338f91d4f00d74597cc3ef7 \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected index fd7f774ee..abc56f234 100644 --- a/tests/cachekey/project/elements/compose4.expected +++ b/tests/cachekey/project/elements/compose4.expected @@ -1 +1 @@ -5b18a8748410d3a4a340ebe368bde55ce4478d28b90e4d372733c77817e18532 \ No newline at end of file +0e00f203ce9bc4163be0ed304fcf2abb6ee39aad4ee9a12d80719708a4327337 \ No newline at end of file diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected index dea2db25b..83345705e 100644 --- a/tests/cachekey/project/elements/compose5.expected +++ b/tests/cachekey/project/elements/compose5.expected @@ -1 +1 @@ -49cae1de4f8b8836c67ad3d06d7cd68c1feb34410dc8e27a1e872f270c86affa \ No newline at end of file +3d8dd9fef508c27961edeb21dd469d04e7ea097c86a98e7c3bf725975548748f \ No newline at end of file diff --git a/tests/cachekey/project/elements/import1.expected b/tests/cachekey/project/elements/import1.expected index 02a5f7534..fd349363e 100644 --- a/tests/cachekey/project/elements/import1.expected +++ b/tests/cachekey/project/elements/import1.expected @@ -1 +1 @@ -2fb0c6421eab90746ae724e0b0b4960591443e500225b75f1b71ceeaa61db8d8 \ No newline at end of file +02f863aedaf175f4b4bb9979a538bd1fb6eabd0ef9d77a633b141c072d957df5 \ No newline at end of file diff --git a/tests/cachekey/project/elements/import2.expected b/tests/cachekey/project/elements/import2.expected index f978f1a24..e68e2b505 100644 --- a/tests/cachekey/project/elements/import2.expected +++ b/tests/cachekey/project/elements/import2.expected @@ -1 +1 @@ -9e7f024b39334d7d01f9984848daeab8866feb7e93b3a522e8f0b16959b9d63c \ No newline at end of file +80ee70ad27ee4640400533585d1b2313b1abdb0034f4159dad42f545310d9c24 \ No newline at end of file diff --git a/tests/cachekey/project/elements/import3.expected b/tests/cachekey/project/elements/import3.expected index 57b409988..1cab93718 100644 --- a/tests/cachekey/project/elements/import3.expected +++ b/tests/cachekey/project/elements/import3.expected @@ -1 +1 @@ -81f00ec3f3cc436b0feb2a9f3792f542c2e57659f3e5ccc68cba49d446b5dcd0 \ No newline at end of file +b30d79b763ba3048945784d06482ee378d2642dff712ecffae737aa6f9391b9f \ No newline at end of file diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected index 1b5bc4c03..18977ecc0 100644 --- a/tests/cachekey/project/elements/script1.expected +++ b/tests/cachekey/project/elements/script1.expected @@ -1 +1 @@ -94d5397f23f35aa8d4b5b4e42c94de8901e08e0a973a8af7a5678f056beffefd \ No newline at end of file +fb69c9237156bdeb0f948078f735189e9d8a4c4dca3c67b6f1ed5fa314f88707 \ No newline at end of file diff --git a/tests/cachekey/project/sources/local1.expected b/tests/cachekey/project/sources/local1.expected index 02a5f7534..fd349363e 100644 --- a/tests/cachekey/project/sources/local1.expected +++ b/tests/cachekey/project/sources/local1.expected @@ -1 +1 @@ -2fb0c6421eab90746ae724e0b0b4960591443e500225b75f1b71ceeaa61db8d8 \ No newline at end of file +02f863aedaf175f4b4bb9979a538bd1fb6eabd0ef9d77a633b141c072d957df5 \ No newline at end of file diff --git a/tests/cachekey/project/sources/local2.expected b/tests/cachekey/project/sources/local2.expected index 1afe39f07..6aa588c9e 100644 --- a/tests/cachekey/project/sources/local2.expected +++ b/tests/cachekey/project/sources/local2.expected @@ -1 +1 @@ -102fd151a74be862cb6d72dd99b9227e8d5b136404c3d11fc7beb17c773a9c72 \ No newline at end of file +b9c5019375c715cb6a239714c78a1bd702d4acf81518f0c05da0217a74c365df \ No newline at end of file diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected index 36166fc72..7d793fade 100644 --- a/tests/cachekey/project/target.expected +++ b/tests/cachekey/project/target.expected @@ -1 +1 @@ -bf7a3412e8fcaaf76853bf73ace41ceca8944a598c777410cdee26a6d0e643be \ No newline at end of file +5accdddcdf28c48173381d9bd5d178dfe9b4b69b9ca456995d0a0d0908654275 \ No newline at end of file -- cgit v1.2.1 From 353745a492102c96d7b2ca465c360836966f46ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 1 Feb 2019 11:28:31 +0000 Subject: _casbaseddirectory.py: Return all directories in list_relative_paths() This matches the change in utils.list_relative_paths(). --- buildstream/storage/_casbaseddirectory.py | 8 ++++---- 1 file 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)) -- cgit v1.2.1