Skip to content

crypttab: removes jijna delimiters from example using when#10079

Merged
felixfontein merged 1 commit intoansible-collections:mainfrom
Akasurde:i10078
Apr 29, 2025
Merged

crypttab: removes jijna delimiters from example using when#10079
felixfontein merged 1 commit intoansible-collections:mainfrom
Akasurde:i10078

Conversation

@Akasurde
Copy link
Member

SUMMARY

The current example includes extra jinja delimiters which
result in double-interpretation of the statement.

Fixes: #10078

Signed-off-by: Abhijeet Kasurde Akasurde@redhat.com

ISSUE TYPE
  • Docs Pull Request

The current example includes extra jinja delimiters which
result in double-interpretation of the statement.

Fixes: ansible-collections#10078

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
@ansibullbot
Copy link
Collaborator

cc @groks
click here for bot help

@ansibullbot ansibullbot added docs docs_only module module plugins plugin (any type) small_patch Hopefully easy to review labels Apr 29, 2025
@felixfontein felixfontein added backport-8 backport-10 Automatically create a backport for the stable-10 branch labels Apr 29, 2025
@felixfontein felixfontein merged commit 1936fe5 into ansible-collections:main Apr 29, 2025
135 checks passed
@patchback
Copy link

patchback bot commented Apr 29, 2025

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

❌ Failed to cleanly apply 1936fe5 on top of patchback/backports/stable-8/1936fe5181f970d18d24b6165165e854f3b30a77/pr-10079

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

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

❌ Failed to cleanly apply 1936fe5 on top of patchback/backports/stable-9/1936fe5181f970d18d24b6165165e854f3b30a77/pr-10079

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

@sivel thanks for reporting!
@Akasurde thanks for fixing!

@patchback
Copy link

patchback bot commented Apr 29, 2025

Backport to stable-10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-10/1936fe5181f970d18d24b6165165e854f3b30a77/pr-10079

Backported as #10080

🤖 @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 Apr 29, 2025
The current example includes extra jinja delimiters which
result in double-interpretation of the statement.

Fixes: #10078

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
(cherry picked from commit 1936fe5)
@Akasurde Akasurde deleted the i10078 branch April 29, 2025 20:23
felixfontein pushed a commit to felixfontein/community.general that referenced this pull request Apr 29, 2025
…ollections#10079)

The current example includes extra jinja delimiters which
result in double-interpretation of the statement.

Fixes: ansible-collections#10078

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
(cherry picked from commit 1936fe5)
@felixfontein
Copy link
Collaborator

Created manual backport to stable-9 in #10081.

felixfontein pushed a commit that referenced this pull request Apr 29, 2025
…miters from example using when (#10080)

crypttab: removes jijna delimiters from example using when (#10079)

The current example includes extra jinja delimiters which
result in double-interpretation of the statement.

Fixes: #10078


(cherry picked from commit 1936fe5)

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
felixfontein added a commit that referenced this pull request Apr 29, 2025
…#10079) (#10081)

crypttab: removes jijna delimiters from example using when (#10079)

The current example includes extra jinja delimiters which
result in double-interpretation of the statement.

Fixes: #10078


(cherry picked from commit 1936fe5)

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
patchback bot pushed a commit that referenced this pull request Apr 29, 2025
…#10079) (#10081)

crypttab: removes jijna delimiters from example using when (#10079)

The current example includes extra jinja delimiters which
result in double-interpretation of the statement.

Fixes: #10078

(cherry picked from commit 1936fe5)

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
(cherry picked from commit 8222f1f)
felixfontein added a commit that referenced this pull request Apr 29, 2025
…jijna delimiters from example using when (#10079) (#10082)

[stable-9] crypttab: removes jijna delimiters from example using when (#10079) (#10081)

crypttab: removes jijna delimiters from example using when (#10079)

The current example includes extra jinja delimiters which
result in double-interpretation of the statement.

Fixes: #10078

(cherry picked from commit 1936fe5)



(cherry picked from commit 8222f1f)

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
shinuza pushed a commit to shinuza/community.general that referenced this pull request Jul 22, 2025
…ollections#10079)

The current example includes extra jinja delimiters which
result in double-interpretation of the statement.

Fixes: ansible-collections#10078

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
smcavoy pushed a commit to smcavoy/community.general that referenced this pull request Nov 28, 2025
…ollections#10079)

The current example includes extra jinja delimiters which
result in double-interpretation of the statement.

Fixes: ansible-collections#10078

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-10 Automatically create a backport for the stable-10 branch docs_only docs module module plugins plugin (any type) small_patch Hopefully easy to review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Incorrect usage of variables in crypttab EXAMPLES

3 participants