From 87c0430628f077bbc0c8591fcace76e7fc5d9718 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 7 Feb 2014 12:17:55 +0400 Subject: [PATCH] Import keys as trusted. --- system/lib.py | 5 ++--- system/t04_mirror/CreateMirror9Test_gold | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/system/lib.py b/system/lib.py index 881996a3..81286370 100644 --- a/system/lib.py +++ b/system/lib.py @@ -117,9 +117,8 @@ class BaseTest(object): self.fixtureWebServer)) if self.fixtureGpg: - self.run_cmd(["gpg", "--no-default-keyring", "--keyring", "aptlytest.gpg", "--import", - os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "debian-archive-keyring.gpg")], - expected_code=2) + self.run_cmd(["gpg", "--no-default-keyring", "--trust-model", "always", "--batch", "--keyring", "aptlytest.gpg", "--import", + os.path.join(os.path.dirname(inspect.getsourcefile(BaseTest)), "files", "debian-archive-keyring.gpg")]) if hasattr(self, "fixtureCmds"): if self.fixtureWebServer: diff --git a/system/t04_mirror/CreateMirror9Test_gold b/system/t04_mirror/CreateMirror9Test_gold index deb6848d..4514c2fd 100644 --- a/system/t04_mirror/CreateMirror9Test_gold +++ b/system/t04_mirror/CreateMirror9Test_gold @@ -3,9 +3,7 @@ gpgv: Signature made Fri Feb 7 06:56:50 2014 MSK using RSA key ID 46925553 gpgv: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) " gpg: Signature made Fri Feb 7 06:56:50 2014 MSK using RSA key ID 46925553 gpg: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) " -gpg: WARNING: This key is not certified with a trusted signature! -gpg: There is no indication that the signature belongs to the owner. -Primary key fingerprint: A1BD 8E9D 78F7 FE5C 3E65 D8AF 8B48 AD62 4692 5553 +gpg: WARNING: Using untrusted key! Mirror [mirror9]: http://mirror.yandex.ru/debian-backports/ squeeze-backports successfully added. You can run 'aptly mirror update mirror9' to download repository contents.