Skip to content
Merged
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
1 change: 1 addition & 0 deletions CHANGES/929.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed PYTHON_GROUP_UPLOADS failing when domains are turned on.
7 changes: 3 additions & 4 deletions pulp_python/app/pypi/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from django.shortcuts import redirect
from datetime import datetime, timezone, timedelta

from rest_framework.reverse import reverse
from django.contrib.sessions.models import Session
from django.db import transaction
from django.db.utils import DatabaseError
Expand All @@ -29,7 +28,7 @@

from pulpcore.plugin.viewsets import OperationPostponedResponse
from pulpcore.plugin.tasking import dispatch
from pulpcore.plugin.util import get_domain
from pulpcore.plugin.util import get_domain, get_url
from pulpcore.plugin.exceptions import TimeoutException
from pulp_python.app.models import (
PythonDistribution,
Expand Down Expand Up @@ -205,15 +204,15 @@ def create_group_upload_task(self, cur_session, repository, artifact, filename,
cur_session["artifacts"] = [(str(artifact.sha256), filename)]
cur_session.modified = False
cur_session.save()
result = dispatch(
task = dispatch(
tasks.upload_group,
exclusive_resources=[artifact, repository],
kwargs={
"session_pk": str(cur_session.session_key),
"repository_pk": str(repository.pk),
},
)
return reverse("tasks-detail", args=[result.pk], request=None)
return get_url(task)


class SimpleView(PackageUploadMixin, ViewSet):
Expand Down