Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow remotes to be associated with repositories #261

Merged
merged 2 commits into from
Apr 12, 2021
Merged

Allow remotes to be associated with repositories #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bee2ec6
Sort lists alphabetically
quba42 Apr 7, 2021
c68bf6d
Allow remotes to be associated with repositories
quba42 Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/8520.feature
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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