Only calculate buildhost and buildtime during an actual build #935
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
Commit fa303d5 moved buildhost and buildtime calculation out of the package generation to early spec initialization, but this broke reproducable builds: if buildtime is to be set from changelog, changelog needs to be parsed first. So either we need to do it twice or we need to do it right, and besides avoiding duplication, conceptually these values are only meaningful during a build and not a parse, so this restores that part of the original code while keeping things thread-safe. Fixes: rpm-software-management#932
|
To make it clear, this is an alternative to #933 to avoid the duplication added there. |
We used to test against explicit digest values until commit e20527a changed the rpmkeys output to drop the actual values and breaking the reproducability test - it was now only testing whether the package we just built has intact digests. Doh. And because of that, commit fa303d5 was able to silently break setting buildtime from changelog (rpm-software-management#932) and why commit 4b15a9e didn't require adjustment of the test-suite, and why addition of the alternative payload digest in commit 83a26ae didn't require changing this test. Maybe something else too. Doh.
|
The test also fixed now, indeed showing that the functionality was broken before. |
bmwiedemann
approved these changes
Nov 11, 2019
|
Excellent, thanks. |
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.
Commit fa303d5 moved buildhost and
buildtime calculation out of the package generation to early spec
initialization, but this broke reproducable builds: if buildtime is
to be set from changelog, changelog needs to be parsed first.
So either we need to do it twice or we need to do it right, and
besides avoiding duplication, conceptually these values are only
meaningful during a build and not a parse, so this restores that part
of the original code while keeping things thread-safe.
Fixes: #932