Skip to content

Fixed group uploads failing when using domains

61afb0a
Select commit
Loading
Failed to load commit list.
Merged

Fixed group uploads failing when using domains #931

Fixed group uploads failing when using domains
61afb0a
Select commit
Loading
Failed to load commit list.
Patchback / Backport to 3.17 completed Aug 12, 2025 in 3s

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

❌ Failed to cleanly apply ae16f6a on top of patchback/backports/3.17/ae16f6a7f6ec106fea10c38b9d81551cc3c7c5ec/pr-931

Details

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