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

deps module util: fix overzealous name cropping #6479

Merged
merged 1 commit into from
May 4, 2023
Merged

deps module util: fix overzealous name cropping #6479

merged 1 commit into from
May 4, 2023

Conversation

felixfontein
Copy link
Collaborator

@felixfontein felixfontein commented May 3, 2023 •
edited
Loading

SUMMARY

Ref: #6467 (comment)

Fixes #6467.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

deps module utils

@felixfontein felixfontein requested a review from russoz May 3, 2023 20:28
@felixfontein felixfontein mentioned this pull request May 3, 2023
Closed
1 task
@ansibullbot
Copy link
Collaborator

cc @russoz
click here for bot help

@ansibullbot ansibullbot added bug This issue/PR relates to a bug has_issue module_utils module_utils plugins plugin (any type) labels May 3, 2023
@russoz russoz merged commit 57cfd1b into ansible-collections:main May 4, 2023
@patchback
Copy link

patchback bot commented May 4, 2023 •
edited
Loading

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

❌ Failed to cleanly apply 57cfd1b on top of patchback/backports/stable-5/57cfd1b46d44ba6ca64206f4606f3bdea3ef3a82/pr-6479

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

patchback bot commented May 4, 2023 •
edited
Loading

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/57cfd1b46d44ba6ca64206f4606f3bdea3ef3a82/pr-6479

Backported as #6489

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

@russoz
Copy link
Collaborator

russoz commented May 4, 2023

Thanks @felixfontein !

patchback bot pushed a commit that referenced this pull request May 4, 2023
@felixfontein @patchback
deps module util: fix overzealous name cropping (#6479)
ff85630 
Fix overzealous name cropping.

(cherry picked from commit 57cfd1b)
@patchback patchback bot mentioned this pull request May 4, 2023
Merged
@felixfontein felixfontein deleted the deps branch May 5, 2023 05:56
@felixfontein
Copy link
Collaborator Author

@russoz thanks for reviewing and merging!

felixfontein added a commit that referenced this pull request May 5, 2023
@patchback @felixfontein
[PR #6479/57cfd1b4 backport][stable-6] deps module util: fix overzeal…
bf90b4e 
…ous name cropping (#6489)

deps module util: fix overzealous name cropping (#6479)

Fix overzealous name cropping.

(cherry picked from commit 57cfd1b)

Co-authored-by: Felix Fontein <felix@fontein.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@russoz russoz russoz approved these changes

Assignees
No one assigned
Labels
bug This issue/PR relates to a bug has_issue module_utils module_utils plugins plugin (any type)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

udm_dns_record not working since 6.6.0
3 participants
@felixfontein @ansibullbot @russoz