This is an automated email from the ASF dual-hosted git repository.
juergbi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/buildstream.git
from 65e2074ad Merge pull request #1966 from apache/juerg/uploadtree
add 4952103e2 _includes.py: Improve message for bug in subproject include
processing
add 07a1e4518 _project.py: Ensure that the parent project is fully loaded
first
add 1f826f49f tests/format/junctions.py: Add `test_nested_include`
new 0e7f8e462 Merge pull request #1969 from apache/juerg/nested-junctions
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/buildstream/_includes.py | 5 +++++
src/buildstream/_project.py | 14 ++++++++++----
tests/format/junctions.py | 19 +++++++++++++++++++
tests/format/junctions/nested-include/project.conf | 4 ++++
.../nested-include}/subproject.bst | 0
.../junctions/nested-include/subproject/project.conf | 4 ++++
.../nested-include}/subproject/sub.txt | 0
.../subproject/subsubproject.bst | 0
.../subproject/subsubproject/include.yml | 0
.../subproject/subsubproject/project.conf | 0
.../subproject/subsubproject/subsub.txt | 0
.../subproject/subsubproject/target.bst | 0
.../subproject/subtarget.bst | 0
.../subproject/target.bst | 0
.../junctions/{nested => nested-include}/target.bst | 0
15 files changed, 42 insertions(+), 4 deletions(-)
create mode 100644 tests/format/junctions/nested-include/project.conf
copy tests/format/{dependencies3/elements =>
junctions/nested-include}/subproject.bst (100%)
create mode 100644
tests/format/junctions/nested-include/subproject/project.conf
copy tests/format/{dependencies3 =>
junctions/nested-include}/subproject/sub.txt (100%)
copy tests/format/junctions/{circular-references =>
nested-include}/subproject/subsubproject.bst (100%)
copy doc/examples/first-project/hello.world =>
tests/format/junctions/nested-include/subproject/subsubproject/include.yml
(100%)
copy tests/format/junctions/{circular-references =>
nested-include}/subproject/subsubproject/project.conf (100%)
copy tests/format/junctions/{circular-references =>
nested-include}/subproject/subsubproject/subsub.txt (100%)
copy tests/format/junctions/{circular-references =>
nested-include}/subproject/subsubproject/target.bst (100%)
copy tests/format/junctions/{nested =>
nested-include}/subproject/subtarget.bst (100%)
copy tests/format/junctions/{circular-references =>
nested-include}/subproject/target.bst (100%)
copy tests/format/junctions/{nested => nested-include}/target.bst (100%)
