project_loader: replace dict keys as well as values #2166
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
|
I can confirm this is fixing bug LP: #1778287 |
|
This should also fix the organize bug, https://bugs.launchpad.net/snapcraft/+bug/1746636, so I am marking LP: #1778287 as a dup of that one. |
sergiusens
requested changes
Jun 25, 2018
The snapcraft CLI actually runs a text replacement over the `snapcraft.yaml`, replacing all occurrences of its built-in variables (such as `$SNAPCRAFT_STAGE`) with their actual values, knowing that, once these are migrated into the final `snap.yaml` the variables have no meaning. However, when it comes to running the replacements on dicts, it only checks the values for replacement, not the keys. Fix this by simply running replacements on the keys as well as the values. LP: #1746636 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
kyrofa
force-pushed
the
bugfix/1778287/incomplete_replacements
branch
from
3631a85
to
0d94216
Compare
Codecov Report
@@ Coverage Diff @@
## master #2166 +/- ##
==========================================
+ Coverage 91.29% 91.29% +<.01%
==========================================
Files 200 200
Lines 12580 12585 +5
Branches 1871 1871
==========================================
+ Hits 11485 11490 +5
Misses 741 741
Partials 354 354
Continue to review full report at Codecov.
|
Good catch @sergiusens, forgot about that one. I've fixed the commit as well as the PR description. |
sergiusens
approved these changes
Jun 25, 2018
|
Two potentially related bugs that would be good to get squished at the same time: LP#1746633 and LP#1766878 |
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.
./runtests.sh static?./runtests.sh unit?The snapcraft CLI actually runs a text replacement over the
snapcraft.yaml, replacing all occurrences of its built-in variables (such as$SNAPCRAFT_STAGE) with their actual values, knowing that, once these are migrated into the finalsnap.yamlthe variables have no meaning. However, when it comes to running the replacements on dicts, it only checks the values for replacement, not the keys. This PR fixes LP: #1746636 by simply running replacements on the keys as well as the values.