Merge branch 'master' of ssh://github.com/gopythongo/aptly-api-client

gopythongo · Apr 17, 2020 · 3262e31 · 3262e31
2 parents 13f0c6c + 109bfa3
commit 3262e31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/aptly_api/parts/publish.py b/aptly_api/parts/publish.py
@@ -126,7 +126,8 @@ def update(self, *, prefix: str, distribution: str,
                snapshots: Optional[Sequence[Dict[str, str]]] = None, force_overwrite: bool = False,
                sign_skip: bool = False, sign_batch: bool = True, sign_gpgkey: Optional[str] = None,
                sign_keyring: Optional[str] = None, sign_secret_keyring: Optional[str] = None,
-               sign_passphrase: Optional[str] = None, sign_passphrase_file: Optional[str] = None) -> PublishEndpoint:
+               sign_passphrase: Optional[str] = None, sign_passphrase_file: Optional[str] = None,
+               skip_cleanup: Optional[bool] = False) -> PublishEndpoint:
         """
         Example:
 
@@ -149,6 +150,8 @@ def update(self, *, prefix: str, distribution: str,
 
         if force_overwrite:
             body["ForceOverwrite"] = True
+        if skip_cleanup:
+            body["SkipCleanup"] = True
 
         sign_dict = {}  # type: Dict[str, Union[bool,str]]
         if sign_skip:

diff --git a/aptly_api/tests/publish.py b/aptly_api/tests/publish.py
@@ -279,7 +279,8 @@ def test_update_snapshot_default_key(self, *, rmock: requests_mock.Mocker) -> No
                 sign_batch=True,
                 sign_passphrase="123456",
                 sign_keyring="/etc/gpg-managed-keyring/pubring.pub",
-                sign_secret_keyring="/etc/gpg-managed-keyring/secring.gpg"
+                sign_secret_keyring="/etc/gpg-managed-keyring/secring.gpg",
+                skip_cleanup=True
             ),
             PublishEndpoint(
                 storage='s3:aptly-repo',