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

[PULP-250] Fix typo in task state logic #6189

Merged
merged 1 commit into from
Jan 9, 2025
Merged

Conversation

dralley
Copy link
Contributor

@dralley dralley commented Jan 9, 2025

No description provided.

Copy link
Member

@pedro-psb pedro-psb left a comment

Choose a reason for hiding this comment

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

Maybe this could be an enum, then it would be catched immediately.
Anyway, we should merge the fix.

@dralley dralley merged commit 15c0182 into pulp:main Jan 9, 2025
12 checks passed
@dralley dralley deleted the fix-typo branch January 9, 2025 20:42
Copy link

patchback bot commented Jan 9, 2025

Backport to 3.39: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 15c0182 on top of patchback/backports/3.39/15c018273686c6d52cd81d427840f1124cf477e2/pr-6189

Backporting merged PR #6189 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/pulp/pulpcore.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/3.39/15c018273686c6d52cd81d427840f1124cf477e2/pr-6189 upstream/3.39
  4. Now, cherry-pick PR [PULP-250] Fix typo in task state logic #6189 contents into that branch:
    $ git cherry-pick -x 15c018273686c6d52cd81d427840f1124cf477e2
    If it'll yell at you with something like fatal: Commit 15c018273686c6d52cd81d427840f1124cf477e2 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 15c018273686c6d52cd81d427840f1124cf477e2
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR [PULP-250] Fix typo in task state logic #6189 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.39/15c018273686c6d52cd81d427840f1124cf477e2/pr-6189
  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.

Copy link

patchback bot commented Jan 9, 2025

Backport to 3.49: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 15c0182 on top of patchback/backports/3.49/15c018273686c6d52cd81d427840f1124cf477e2/pr-6189

Backporting merged PR #6189 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/pulp/pulpcore.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/3.49/15c018273686c6d52cd81d427840f1124cf477e2/pr-6189 upstream/3.49
  4. Now, cherry-pick PR [PULP-250] Fix typo in task state logic #6189 contents into that branch:
    $ git cherry-pick -x 15c018273686c6d52cd81d427840f1124cf477e2
    If it'll yell at you with something like fatal: Commit 15c018273686c6d52cd81d427840f1124cf477e2 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 15c018273686c6d52cd81d427840f1124cf477e2
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR [PULP-250] Fix typo in task state logic #6189 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.49/15c018273686c6d52cd81d427840f1124cf477e2/pr-6189
  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.

Copy link

patchback bot commented Jan 9, 2025

Backport to 3.63: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.63/15c018273686c6d52cd81d427840f1124cf477e2/pr-6189

Backported as #6190

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

Copy link

patchback bot commented Jan 9, 2025

Backport to 3.69: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.69/15c018273686c6d52cd81d427840f1124cf477e2/pr-6189

Backported as #6191

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants