otk: remove otk.define from the target tree
#177
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When trying to compile the example in PR#167 I noticed slightly
strange behavior. Currently when doing:
```
otk.target.osbuild:
otk.include: "16-include-copy/repository-${version}.yaml"
```
the output is
```
{
'otk.include': '16-include-copy/repository-${version}.yaml',
'sources': {},
'version': '2',
}
```
The reason is that we have an extra `tree.copy()` when we process
includes. However in other parts of the code (including accross
recursions) we use "tree.update()" so that the tree we worked
on and the tree that the other parts of the recursion go out of
sync. The easiest fix is to simply drop the copy.
While looking at some output I noticed that an `otk.define` inside
a `target` will yield a verbatim `otk.define` inside the target.
So:
```yaml
otk.target.osbuild:
otk.define:
foo: bar
```
was yielding:
```
{
"sources": {},
"version": "2",
"otk.define": {
"a": "b",
},
"a": "b"
}
```
This is most certainly unwanted. This commit fixes it by simply
removing the `otk.define` from the processed tree.
Alternatively we could of course force people to use `otk.define`
only outside of targets but that would feel slightly weird and
would probably not work well when externals are used to define
vars.
mvo5
force-pushed
the
fix-transform-define
branch
from
3b7fd9e
to
6f37796
Compare
supakeen
approved these changes
Jul 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While looking at some output I noticed that an
otk.defineinsidea
targetwill yield a verbatimotk.defineinside the target.So:
was yielding:
{ "sources": {}, "version": "2", "otk.define": { "a": "b", }, "a": "b" }This is most certainly unwanted. This commit fixes it by simply
removing the
otk.definefrom the processed tree.Alternatively we could of course force people to use
otk.defineonly outside of targets but that would feel slightly weird and
would probably not work well when externals are used to define
vars.
Build on top of #175