Skip to content

Commit

Permalink
Merge pull request #261 from quba42/repo_remote
Browse files Browse the repository at this point in the history
Allow remotes to be associated with repositories
  • Loading branch information
quba42 committed Apr 12, 2021
2 parents bbfa359 + c68bf6d commit f38d9ff
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGES/8520.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
APT repositories may now reference an APT remote, that will automatically be used for syncs.
20 changes: 12 additions & 8 deletions pulp_deb/app/models/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
from pulpcore.plugin.repo_version_utils import remove_duplicates, validate_repo_version

from pulp_deb.app.models import (
AptRemote,
GenericContent,
ReleaseFile,
PackageIndex,
InstallerFileIndex,
Package,
InstallerPackage,
Package,
PackageIndex,
PackageReleaseComponent,
Release,
ReleaseArchitecture,
ReleaseComponent,
PackageReleaseComponent,
ReleaseFile,
)


Expand All @@ -24,15 +25,18 @@ class AptRepository(Repository):
TYPE = "deb"
CONTENT_TYPES = [
GenericContent,
ReleaseFile,
PackageIndex,
InstallerFileIndex,
Package,
InstallerPackage,
Package,
PackageIndex,
PackageReleaseComponent,
Release,
ReleaseArchitecture,
ReleaseComponent,
PackageReleaseComponent,
ReleaseFile,
]
REMOTE_TYPES = [
AptRemote,
]

class Meta:
Expand Down
6 changes: 4 additions & 2 deletions pulp_deb/app/viewsets/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,13 @@ def sync(self, request, pk):
Dispatches a sync task.
"""
repository = self.get_object()
serializer = RepositorySyncURLSerializer(data=request.data, context={"request": request})
serializer = RepositorySyncURLSerializer(
data=request.data, context={"request": request, "repository_pk": pk}
)

# Validate synchronously to return 400 errors.
serializer.is_valid(raise_exception=True)
remote = serializer.validated_data.get("remote")
remote = serializer.validated_data.get("remote", repository.remote)
mirror = serializer.validated_data.get("mirror", True)

result = enqueue_with_reservation(
Expand Down

0 comments on commit f38d9ff

Please sign in to comment.