Skip to content

Commit

Permalink
Merge pull request #3290 from jortel/repository-version-created-conte…
Browse files Browse the repository at this point in the history
…nt-fix

Removed RepositoryVersion._created_resource
  • Loading branch information
jortel committed Jan 29, 2018
2 parents d0cf130 + bf2ba75 commit f90c29e
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions plugin/pulpcore/plugin/repository.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from contextlib import suppress
from gettext import gettext as _

from django.db import transaction
from django.db.utils import IntegrityError


from pulpcore.app import models
from pulpcore.tasking.util import get_current_task_id
from pulpcore.exceptions import ResourceImmutableError
Expand Down Expand Up @@ -31,14 +31,13 @@ def latest(cls, repository):
Get the latest RepositoryVersion on a repository
Args:
repository (pulpcore.plugin.repository): to get the latest version of
repository (pulpcore.plugin.models.Repository): to get the latest version of
Returns:
pulpcore.plugin.repository.RepositoryVersion: The latest RepositoryVersion
"""
with suppress(models.RepositoryVersion.DoesNotExist):

model = repository.versions.exclude(complete=False).latest()
return RepositoryVersion(model)

Expand All @@ -48,7 +47,7 @@ def create(cls, repository):
Create a new RepositoryVersion
Args:
repository (pulpcore.plugin.repository): to create a new version of
repository (pulpcore.plugin.models.Repository): to create a new version of
Returns:
pulpcore.plugin.repository.RepositoryVersion: The Created RepositoryVersion
Expand All @@ -66,16 +65,14 @@ def create(cls, repository):
version.save()
resource = models.CreatedResource(content_object=version)
resource.save()
return cls(version, resource)
return cls(version)

def __init__(self, model, resource=None):
def __init__(self, model):
"""
Args:
model (pulpcore.models.repository.RepositoryVersion)
resource (pulpcore.models.task.CreatedResource)
"""
self._model = model
self._created_resource = resource

@property
def number(self):
Expand Down Expand Up @@ -158,11 +155,10 @@ def delete(self):
models.RepositoryContent.objects.filter(version_added=self._model).delete()
models.RepositoryContent.objects.filter(version_removed=self._model)\
.update(version_removed=None)
models.CreatedResource.objects.filter(object_id=self._model.pk).delete()
self._model.repository.last_version = self._model.number - 1
self._model.repository.save()
self._model.delete()
if self._created_resource is not None:
self._created_resource.delete()

def __enter__(self):
"""
Expand Down

0 comments on commit f90c29e

Please sign in to comment.