buildsys: Use bundle name setting for output #2403
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
The `bundled-output-path` setting for external files had a small error when processing the output bundle for Go project dependencies where it would always use the default value, even when a different value was provided. This fixes the name of the variable used so it uses the provided name instead. This already handles setting this to the default value if the package maintainer has not provided an overridden value. Signed-off-by: Sean McGinnis <[email protected]>
jpmcb
approved these changes
Sep 7, 2022
There was a problem hiding this comment.
Excellent! Tested this out on the hotdog package and gave the following Cargo.toml change:
bundle-output-path: "woof-woof.tar.gz"
and I see it now correctly renames it in the package's working directory:
❯ ls -la
total 1204
drwxr-xr-x. 3 fedora fedora 4096 Sep 7 21:56 .
drwxr-xr-x. 95 fedora fedora 4096 Sep 6 22:27 ..
-rw-r--r--. 1 fedora fedora 209 Aug 5 21:51 build.rs
-rw-r--r--. 1 fedora fedora 624 Sep 7 21:53 Cargo.toml
-rw-r--r--. 1 fedora fedora 17270 Sep 7 21:56 hotdog-b85b755.tar.gz
-rw-r--r--. 1 fedora fedora 2042 Sep 6 16:24 hotdog.spec
-rw-r--r--. 1 fedora fedora 12 Aug 5 21:51 pkg.rs
drwxr-xr-x. 3 fedora fedora 4096 Aug 23 19:25 target
-rw-r--r--. 1 fedora fedora 1180409 Sep 7 21:56 woof-woof.tar.gz
🐕
bcressey
approved these changes
Sep 7, 2022
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.
Issue number:
Closes #2402
Description of changes:
The
bundled-output-pathsetting for external files had a small error when processing the output bundle for Go project dependencies where it would always use the default value, even when a different value was provided. This fixes the name of the variable used so it uses the provided name instead. This already handles setting this to the default value if the package maintainer has not provided an overridden value.Testing done:
Made local change in #2377 and made sure it would try to use the specified name instead of the default.
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.