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

Allow to specify base repository for modify #1132

Merged
merged 2 commits into from
Feb 17, 2025

Conversation

mdellweg
Copy link
Member

@mdellweg mdellweg commented Feb 6, 2025

fixes #618

@mdellweg mdellweg marked this pull request as ready for review February 6, 2025 11:38
@mdellweg mdellweg enabled auto-merge (rebase) February 6, 2025 11:38
@@ -185,6 +185,8 @@ def repository(ctx: click.Context, pulp_ctx: PulpCLIContext, /, repo_type: str)
add_decorators=content_options,
remove_decorators=content_options,
modify_decorators=modify_options,
base_default_plugin="ansible",
Copy link
Contributor

Choose a reason for hiding this comment

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

pulp-cli-deb and pulp-cli-ostree plugins will need to add this as well, yes?

Copy link
Member Author

@mdellweg mdellweg Feb 13, 2025

Choose a reason for hiding this comment

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

They should. But it's not like they will be broken immediately by this.
Until adoption, repositories need to be specified capped and gowned.

@mdellweg mdellweg merged commit ddd7fbb into pulp:main Feb 17, 2025
18 checks passed
@mdellweg mdellweg deleted the 618_modify_base branch February 17, 2025 01:38
Copy link

patchback bot commented Feb 17, 2025

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

❌ Failed to cleanly apply ddd7fbb on top of patchback/backports/0.30/ddd7fbb9430f7672ce44dbaac66e6c89a9ae9149/pr-1132

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

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.

RPM repository content modify base-version expects the wrong type
2 participants