Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pulp_python/app/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from logging import getLogger
from pathlib import PurePath

from aiohttp.web import json_response
from aiohttp.web import HTTPFound, json_response
from django.conf import settings
from django.contrib.postgres.fields import ArrayField
from django.core.exceptions import ObjectDoesNotExist
Expand Down Expand Up @@ -91,6 +91,9 @@ def content_handler(self, path):
name = path.parts[1]
elif path.match("pypi/*/json"):
name = path.parts[1]
elif len(path.parts) >= 2 and path.parts[0] == "packages":
filename = "/".join(path.parts[1:])
raise HTTPFound(location=f"../{filename}") # 302
elif len(path.parts) and path.parts[0] == "simple":
# Temporary fix for PublishedMetadata not being properly served from remote storage
# https://github.com/pulp/pulp_python/issues/413
Expand Down
2 changes: 1 addition & 1 deletion pulp_python/app/pypi/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ def retrieve(self, request, path, package):
local_releases = {
p["filename"]: {
**p,
"url": urljoin(self.base_content_url, f"{path}/{p['filename']}"),
"url": urljoin(self.base_content_url, f"{path}/packages/{p['filename']}"),
"upload_time": p["repo_added_time"],
"provenance": (
self.get_provenance_url(normalized, p["version"], p["filename"])
Expand Down
Loading