Skip to content

Commit

Permalink
Small changes to match current best practices
Browse files Browse the repository at this point in the history
Required PR: pulp/pulpcore#1229

[noissue]
  • Loading branch information
dralley committed Apr 2, 2021
1 parent 376a671 commit 39939df
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions pulp_ansible/app/tasks/collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,15 @@ def sync(remote_pk, repository_pk, mirror, optimize):
"""
remote = CollectionRemote.objects.get(pk=remote_pk)
repository = AnsibleRepository.objects.get(pk=repository_pk)
latest_version_before_sync = repository.latest_version()

if not remote.url:
raise ValueError(_("A CollectionRemote must have a 'url' specified to synchronize."))

first_stage = CollectionSyncFirstStage(remote, repository, optimize)
d_version = AnsibleDeclarativeVersion(first_stage, repository, mirror=mirror)
d_version.create()
repo_version = d_version.create()

repo_version = repository.latest_version()
if repo_version.number == latest_version_before_sync.number:
if not repo_version:
return

if first_stage.last_synced_metadata_time:
Expand Down
2 changes: 1 addition & 1 deletion pulp_ansible/app/tasks/roles.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def synchronize(remote_pk, repository_pk, mirror=False):
)
first_stage = RoleFirstStage(remote)
d_version = DeclarativeVersion(first_stage, repository, mirror=mirror)
d_version.create()
return d_version.create()


class RoleFirstStage(Stage):
Expand Down

0 comments on commit 39939df

Please sign in to comment.