Skip to content

Commit

Permalink
Single upload filename fix
Browse files Browse the repository at this point in the history
Add right 'location_href' property (from artifact)
when creating content by one shot uploader.

closes: #4656
https://pulp.plan.io/issues/4656

Signed-off-by: Pavel Picka <ppicka@redhat.com>
  • Loading branch information
pavelpicka committed Apr 9, 2019
1 parent 832032a commit a827194
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 2 additions & 5 deletions pulp_rpm/app/upload.py
@@ -1,22 +1,19 @@
import os

from pulp_rpm.app.shared_utils import _prepare_package
from pulp_rpm.app.models import Package
from pulpcore.app.models.task import CreatedResource
from pulpcore.app.models.content import ContentArtifact
from pulpcore.app.models.repository import RepositoryVersion


def one_shot_upload(artifact, repository=None):
def one_shot_upload(artifact, filename, repository=None):
"""
One shot upload for RPM package.
Args:
artifact: validated artifact for a file
filename : name of file
repository: repository to extend with new pkg
"""
filename = os.path.basename(artifact.file.path)

# export META from rpm and prepare dict as saveable format
try:
new_pkg = _prepare_package(artifact, filename)
Expand Down
2 changes: 2 additions & 0 deletions pulp_rpm/app/viewsets.py
Expand Up @@ -233,6 +233,7 @@ def post(self, request):
serializer.is_valid(raise_exception=True)

artifact = Artifact.init_and_validate(request.data['file'])
filename = request.data['file'].name

if 'repository' in request.data:
repository = serializer.validated_data['repository']
Expand All @@ -249,6 +250,7 @@ def post(self, request):
one_shot_upload, [artifact],
kwargs={
'artifact': artifact,
'filename': filename,
'repository': repository,
})
return OperationPostponedResponse(async_result, request)

0 comments on commit a827194

Please sign in to comment.