Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Smaller fixes to support upcoming commits #1664

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Conversation

kacf
Copy link
Member

@kacf kacf commented Sep 9, 2024

No description provided.

No changelog needed, because `resume` has not been released yet.

Changelog: None
Ticket: None

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
This was my own mistake, but it's an easy one to
make. `CmdlineOptionsIterator` takes two arguments, options with
values, and options without values. However the two functions
`CommandOptsSetWithValue` and `CommandOptsSetWithoutValue` will filter
and construct the correct lists from one single list of options, but
it's easy to conclude that the options need to be kept in separate
lists. This was made even more confusing by the call sites not passing
in this one list consistently, but instead passing it in depending on
whether that particular command has arguments or not. This is not
necessary, since the two aforementioned functions would automagically
construct the correct (empty) lists based on filtering.

Simplify this, and give the constructor one argument instead, the full
list of options, and then it can itself do the filtering, so that it
doesn't look like we are using two different lists from call sites.

This removes the need for the `options_w_values` list.

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
@mender-test-bot
Copy link

@kacf, Let me know if you want to start the integration pipeline by mentioning me and the command "start pipeline".


my commands and options

You can trigger a pipeline on multiple prs with:

  • mentioning me and start pipeline --pr mender/127 --pr mender-connect/255

You can start a fast pipeline, disabling full integration tests with:

  • mentioning me and start pipeline --fast

You can trigger GitHub->GitLab branch sync with:

  • mentioning me and sync

You can cherry pick to a given branch or branches with:

  • mentioning me and:
 cherry-pick to:
 * 1.0.x
 * 2.0.x

@kacf kacf merged commit f2cc0dd into mendersoftware:master Sep 10, 2024
18 checks passed
@kacf kacf deleted the small_fixes branch September 10, 2024 10:13
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