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.

Sign up for GitHub

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

Jump to bottom

gio_mime: fix bug when looking for version #9171

Merged
merged 2 commits into from
Nov 23, 2024
Merged

gio_mime: fix bug when looking for version #9171

merged 2 commits into from
Nov 23, 2024

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Nov 22, 2024

SUMMARY

Fix the command line for gio_mime when determining version

Fixes #9158

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

gio_mime

@ansibullbot ansibullbot added bug This issue/PR relates to a bug module module module_utils module_utils plugins plugin (any type) tests tests unit tests/unit labels Nov 22, 2024
@felixfontein felixfontein mentioned this pull request Nov 22, 2024
Closed
1 task
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-9 Automatically create a backport for the stable-9 branch backport-10 Automatically create a backport for the stable-10 branch labels Nov 22, 2024
@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Nov 23, 2024
@felixfontein felixfontein merged commit 152339a into ansible-collections:main Nov 23, 2024
129 checks passed
@patchback Patchback
Copy link

patchback bot commented Nov 23, 2024 •
edited
Loading

Backport to stable-9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 152339a on top of patchback/backports/stable-9/152339a8f9e7c3986399b7c4eeab86a617d0ae54/pr-9171

Backporting merged PR #9171 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it: 
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code: 
    $ git fetch upstream
$ git checkout -b patchback/backports/stable-9/152339a8f9e7c3986399b7c4eeab86a617d0ae54/pr-9171 upstream/stable-9
  4. Now, cherry-pick PR gio_mime: fix bug when looking for version #9171 contents into that branch: 
    $ git cherry-pick -x 152339a8f9e7c3986399b7c4eeab86a617d0ae54
    If it'll yell at you with something like fatal: Commit 152339a8f9e7c3986399b7c4eeab86a617d0ae54 is a merge but no -m option was given., add -m 1 as follows instead: 
    $ git cherry-pick -m1 -x 152339a8f9e7c3986399b7c4eeab86a617d0ae54
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR gio_mime: fix bug when looking for version #9171 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-9/152339a8f9e7c3986399b7c4eeab86a617d0ae54/pr-9171
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback Patchback
Copy link

patchback bot commented Nov 23, 2024 •
edited
Loading

Backport to stable-10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-10/152339a8f9e7c3986399b7c4eeab86a617d0ae54/pr-9171

Backported as #9177

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Nov 23, 2024
@russoz @patchback
gio_mime: fix bug when looking for version (#9171)
2f3fe11 
* gio_mime: fix bug when looking for version

* add changelog frag

(cherry picked from commit 152339a)
@patchback patchback bot mentioned this pull request Nov 23, 2024
Merged
felixfontein pushed a commit that referenced this pull request Nov 23, 2024
@patchback @russoz
[PR #9171/152339a8 backport][stable-10] gio_mime: fix bug when lookin…
0ff52ab 
…g for version (#9177)

gio_mime: fix bug when looking for version (#9171)

* gio_mime: fix bug when looking for version

* add changelog frag

(cherry picked from commit 152339a)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
@russoz russoz deleted the 9158-gio-version branch November 23, 2024 22:05
Massl123 pushed a commit to Massl123/community.general that referenced this pull request Feb 7, 2025
@russoz @Massl123
gio_mime: fix bug when looking for version (ansible-collections#9171)
73e5e9a 
* gio_mime: fix bug when looking for version

* add changelog frag
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein approved these changes

Assignees
No one assigned
Labels
backport-9 Automatically create a backport for the stable-9 branch backport-10 Automatically create a backport for the stable-10 branch bug This issue/PR relates to a bug has_issue module_utils module_utils module module plugins plugin (any type) tests tests unit tests/unit
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

gio_mime: gio mime --version check is called incorrectly
3 participants
@russoz @felixfontein @ansibullbot