Skip to content

[PULP-1739] Fix upload_time to use repo addition time#1235

Merged
jobselko merged 1 commit into
pulp:mainfrom
jobselko:1232
May 18, 2026
Merged

[PULP-1739] Fix upload_time to use repo addition time#1235
jobselko merged 1 commit into
pulp:mainfrom
jobselko:1232

Conversation

@jobselko
Copy link
Copy Markdown
Member

closes #1232

📜 Checklist

  • Commits are cleanly separated with meaningful messages (simple features and bug fixes should be squashed to one commit)
  • A changelog entry or entries has been added for any significant changes
  • Follows the Pulp policy on AI Usage
  • (For new features) - User documentation and test coverage has been added

See: Pull Request Walkthrough

closes pulp#1232
Assisted By: Claude Opus 4.6
@jobselko jobselko self-assigned this May 15, 2026
Copy link
Copy Markdown
Contributor

@gerrod3 gerrod3 left a comment

Choose a reason for hiding this comment

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

Very nice fix!

@jobselko jobselko merged commit 760a28a into pulp:main May 18, 2026
25 of 27 checks passed
@patchback
Copy link
Copy Markdown

patchback Bot commented May 18, 2026

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

❌ Failed to cleanly apply 760a28a on top of patchback/backports/3.27/760a28a2cd4ec8a081880ad96cb37f4da046f663/pr-1235

Backporting merged PR #1235 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.27/760a28a2cd4ec8a081880ad96cb37f4da046f663/pr-1235 upstream/3.27
  4. Now, cherry-pick PR [PULP-1739] Fix upload_time to use repo addition time #1235 contents into that branch:
    $ git cherry-pick -x 760a28a2cd4ec8a081880ad96cb37f4da046f663
    If it'll yell at you with something like fatal: Commit 760a28a2cd4ec8a081880ad96cb37f4da046f663 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 760a28a2cd4ec8a081880ad96cb37f4da046f663
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR [PULP-1739] Fix upload_time to use repo addition time #1235 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.27/760a28a2cd4ec8a081880ad96cb37f4da046f663/pr-1235
  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
Copy Markdown

patchback Bot commented May 18, 2026

Backport to 3.30: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.30/760a28a2cd4ec8a081880ad96cb37f4da046f663/pr-1235

Backported as #1236

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

jobselko added a commit that referenced this pull request May 18, 2026
…d4ec8a081880ad96cb37f4da046f663/pr-1235

[PR #1235/760a28a2 backport][3.30] [PULP-1739] Fix upload_time to use repo addition time
jobselko added a commit that referenced this pull request May 19, 2026
[PULP-1739] Fix upload_time to use repo addition time

(cherry picked from commit 760a28a)
@jobselko jobselko deleted the 1232 branch May 19, 2026 11:59
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.

PEP 691 JSON API: upload-time should reflect when package was added to repository, not pulp_created

2 participants