Skip to content

Make preprocess_entity properly subclassable again - #1466

Merged
mdellweg merged 1 commit into
pulp:mainfrom
mdellweg:fix_preprocess
Aug 26, 2026
Merged

Make preprocess_entity properly subclassable again#1466
mdellweg merged 1 commit into
pulp:mainfrom
mdellweg:fix_preprocess

Conversation

@mdellweg

Copy link
Copy Markdown
Member

No description provided.

@mdellweg
mdellweg enabled auto-merge (rebase) August 26, 2026 14:08
@mdellweg
mdellweg merged commit 930e766 into pulp:main Aug 26, 2026
17 checks passed
@mdellweg
mdellweg deleted the fix_preprocess branch August 26, 2026 15:13
@patchback

patchback Bot commented Aug 27, 2026

Copy link
Copy Markdown

Backport to 0.40: 💚 backport PR created

✅ Backport PR branch: patchback/backports/0.40/930e766fc9109e42147599e7ae66bd9440f653ef/pr-1466

Backported as #1469

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

@patchback

patchback Bot commented Aug 27, 2026

Copy link
Copy Markdown

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

❌ Failed to cleanly apply 930e766 on top of patchback/backports/0.38/930e766fc9109e42147599e7ae66bd9440f653ef/pr-1466

Backporting merged PR #1466 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/pulp-cli.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/0.38/930e766fc9109e42147599e7ae66bd9440f653ef/pr-1466 upstream/0.38
  4. Now, cherry-pick PR Make preprocess_entity properly subclassable again #1466 contents into that branch:
    $ git cherry-pick -x 930e766fc9109e42147599e7ae66bd9440f653ef
    If it'll yell at you with something like fatal: Commit 930e766fc9109e42147599e7ae66bd9440f653ef is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 930e766fc9109e42147599e7ae66bd9440f653ef
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Make preprocess_entity properly subclassable again #1466 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/0.38/930e766fc9109e42147599e7ae66bd9440f653ef/pr-1466
  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 Bot commented Aug 27, 2026

Copy link
Copy Markdown

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

❌ Failed to cleanly apply 930e766 on top of patchback/backports/0.37/930e766fc9109e42147599e7ae66bd9440f653ef/pr-1466

Backporting merged PR #1466 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/pulp-cli.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/0.37/930e766fc9109e42147599e7ae66bd9440f653ef/pr-1466 upstream/0.37
  4. Now, cherry-pick PR Make preprocess_entity properly subclassable again #1466 contents into that branch:
    $ git cherry-pick -x 930e766fc9109e42147599e7ae66bd9440f653ef
    If it'll yell at you with something like fatal: Commit 930e766fc9109e42147599e7ae66bd9440f653ef is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 930e766fc9109e42147599e7ae66bd9440f653ef
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Make preprocess_entity properly subclassable again #1466 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/0.37/930e766fc9109e42147599e7ae66bd9440f653ef/pr-1466
  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 Bot commented Aug 27, 2026

Copy link
Copy Markdown

Backport to 0.39: 💚 backport PR created

✅ Backport PR branch: patchback/backports/0.39/930e766fc9109e42147599e7ae66bd9440f653ef/pr-1466

Backported as #1470

🤖 @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