Skip to content

Conversation

@luben
Copy link
Contributor

@luben luben commented Sep 29, 2017

Fixes #95 : substitution inside the file should work without the full
path where they are included.

Fixes #95 : substitution inside the file should work without the full
path where they are included.
@puppetcla
Copy link

CLA signed by all contributors.

@MikaelSmith
Copy link
Contributor

Ah, sorry I missed this.

Can you add a test like https://github.com/puppetlabs/cpp-hocon/blob/master/lib/tests/conf_parser_test.cc#L627-L633 - but with file() removed - to the PR?

@MikaelSmith
Copy link
Contributor

Also, thanks so much for investigating and putting together a fix!

@luben
Copy link
Contributor Author

luben commented Jan 17, 2018

This PR does not fix include file("path") vs include "path" case but it's about resolving the substitutions in the included files: don't only consider path from the config root but also from the included file root.

@MikaelSmith
Copy link
Contributor

Ah right, that would require a more complex example.

@MikaelSmith MikaelSmith merged commit b24fb61 into puppetlabs:master Jan 17, 2018
@luben
Copy link
Contributor Author

luben commented Jan 17, 2018

Actually the fixtures already had an example pattern I can use. Sent a PR with the test,

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants