Fix ~bpo version increment to bump local counter#60
Open
Robie Basak (basak-qcom) wants to merge 2 commits into
Open
Fix ~bpo version increment to bump local counter#60Robie Basak (basak-qcom) wants to merge 2 commits into
Robie Basak (basak-qcom) wants to merge 2 commits into
Conversation
If bumping 1.0.19+ds-0qli3~bpo13+1~ then the answer should be 1.0.19+ds-0qli3~bpo13+2~ and not 1.0.19+ds-0qli3~bpo14+1~. This was filed as #52. First I'm adding a test to it to demonstrate the problem. My next change will fix it. Signed-off-by: Robie Basak <robie.basak@oss.qualcomm.com>
The ~bpo handler was treating the trailing +M as an opaque suffix and incrementing N instead. For a version like ~bpo13+1 the result was ~bpo14+1 rather than the correct ~bpo13+2. Rewrite the regex to capture the optional +M group explicitly and increment M when present, falling back to incrementing N for the plain ~bpoN form. Remove the xfail mark from the corresponding test. Fixes: #52 Signed-off-by: Robie Basak <robie.basak@oss.qualcomm.com>
Robie Basak (basak-qcom)
force-pushed
the
bpo-bumps
branch
from
c2ce385 to
57156c7
Compare
Contributor
Author
|
The test suite isn't run automatically, but I have verified it by hand. The failing check is long term failing and unrelated to this PR. |
Robie Basak (basak-qcom)
assigned
Agathe Porte (gagath) and unassigned
Agathe Porte (gagath)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The ~bpo handler was treating the trailing +M as an opaque suffix and incrementing N instead. For a version like ~bpo13+1 the result was ~bpo14+1 rather than the correct ~bpo13+2.
Rewrite the regex to capture the optional +M group explicitly and increment M when present, falling back to incrementing N for the plain ~bpoN form.
Fixes: #52