Skip to content

Commit 2d75e7a

Browse files
authored
Merge pull request #932 from gerrod3/patchback/backports/3.17/ae16f6a7f6ec106fea10c38b9d81551cc3c7c5ec/pr-931
Merge pull request #931 from gerrod3/group-upload-task-fix
2 parents 0dd9c69 + b565aa6 commit 2d75e7a

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

CHANGES/929.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed PYTHON_GROUP_UPLOADS failing when domains are turned on.

pulp_python/app/pypi/views.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from django.shortcuts import redirect
99
from datetime import datetime, timezone, timedelta
1010

11-
from rest_framework.reverse import reverse
1211
from django.contrib.sessions.models import Session
1312
from django.db import transaction
1413
from django.db.utils import DatabaseError
@@ -29,7 +28,7 @@
2928

3029
from pulpcore.plugin.viewsets import OperationPostponedResponse
3130
from pulpcore.plugin.tasking import dispatch
32-
from pulpcore.plugin.util import get_domain
31+
from pulpcore.plugin.util import get_domain, get_url
3332
from pulpcore.plugin.exceptions import TimeoutException
3433
from pulp_python.app.models import (
3534
PythonDistribution,
@@ -200,10 +199,15 @@ def create_group_upload_task(self, cur_session, repository, artifact, filename,
200199
cur_session['artifacts'] = [(str(artifact.sha256), filename)]
201200
cur_session.modified = False
202201
cur_session.save()
203-
result = dispatch(tasks.upload_group, exclusive_resources=[artifact, repository],
204-
kwargs={"session_pk": str(cur_session.session_key),
205-
"repository_pk": str(repository.pk)})
206-
return reverse('tasks-detail', args=[result.pk], request=None)
202+
task = dispatch(
203+
tasks.upload_group,
204+
exclusive_resources=[artifact, repository],
205+
kwargs={
206+
"session_pk": str(cur_session.session_key),
207+
"repository_pk": str(repository.pk),
208+
},
209+
)
210+
return get_url(task)
207211

208212

209213
class SimpleView(PackageUploadMixin, ViewSet):

0 commit comments

Comments
 (0)