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

snap: fix case when snap list is empty #7124

Merged

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Aug 16, 2023

SUMMARY

Exception was being raised when snap list was empty.

Fixes #7120

ISSUE TYPE
  • Bugfix Pull Request
  • Test Pull Request
COMPONENT NAME

snap

@ansibullbot
Copy link
Collaborator

@ansibullbot ansibullbot added bug This issue/PR relates to a bug integration tests/integration module module plugins plugin (any type) tests tests labels Aug 16, 2023
@felixfontein felixfontein added backport-6 backport-7 Automatically create a backport for the stable-7 branch labels Aug 17, 2023
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, looks good! Can you please add a changelog fragment? :)

@felixfontein felixfontein added the check-before-release PR will be looked at again shortly before release and merged if possible. label Aug 17, 2023
@felixfontein felixfontein merged commit 33998a5 into ansible-collections:main Aug 18, 2023
145 checks passed
@patchback
Copy link

patchback bot commented Aug 18, 2023

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

❌ Failed to cleanly apply 33998a5 on top of patchback/backports/stable-6/33998a5b707a9797f3ba594571ff77744ad0a764/pr-7124

Backporting merged PR #7124 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-6/33998a5b707a9797f3ba594571ff77744ad0a764/pr-7124 upstream/stable-6
  4. Now, cherry-pick PR snap: fix case when snap list is empty #7124 contents into that branch:
    $ git cherry-pick -x 33998a5b707a9797f3ba594571ff77744ad0a764
    If it'll yell at you with something like fatal: Commit 33998a5b707a9797f3ba594571ff77744ad0a764 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 33998a5b707a9797f3ba594571ff77744ad0a764
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR snap: fix case when snap list is empty #7124 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-6/33998a5b707a9797f3ba594571ff77744ad0a764/pr-7124
  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.

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Aug 18, 2023
@patchback
Copy link

patchback bot commented Aug 18, 2023

Backport to stable-7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-7/33998a5b707a9797f3ba594571ff77744ad0a764/pr-7124

Backported as #7128

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

@felixfontein
Copy link
Collaborator

@russoz thanks for fixing this!

patchback bot pushed a commit that referenced this pull request Aug 18, 2023
* fix case when snap list is empty

* add changelog frag

(cherry picked from commit 33998a5)
felixfontein pushed a commit that referenced this pull request Aug 18, 2023
…is empty (#7128)

snap: fix case when snap list is empty (#7124)

* fix case when snap list is empty

* add changelog frag

(cherry picked from commit 33998a5)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
@russoz russoz deleted the 7120-snap-empty-list branch August 18, 2023 09:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-7 Automatically create a backport for the stable-7 branch bug This issue/PR relates to a bug integration tests/integration module module plugins plugin (any type) tests tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

community.general.snap fails on 7.3.0 when list of packages is empty
3 participants