From 90824e056c24a37558b1f394bba6ea8a8d62b014 Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Fri, 28 May 2021 16:18:50 -0400 Subject: [PATCH] archive: move check for verify_signature into check_dsc_signature --- ubuntutools/archive.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntutools/archive.py b/ubuntutools/archive.py index 22291b7..a386b69 100644 --- a/ubuntutools/archive.py +++ b/ubuntutools/archive.py @@ -187,8 +187,7 @@ class SourcePackage(ABC): self._dsc = Dsc(f.read()) self.source = self._dsc['Source'] self._version = Version(self._dsc['Version']) - if self._verify_signature: - self._check_dsc_signature() + self._check_dsc_signature() @property def lp_spph(self): @@ -286,8 +285,7 @@ class SourcePackage(ABC): self.pull_dsc() with open(self.dsc_pathname, 'rb') as f: self._dsc = Dsc(f.read()) - if self._verify_signature: - self._check_dsc_signature() + self._check_dsc_signature() return self._dsc def getDistribution(self): @@ -336,6 +334,8 @@ class SourcePackage(ABC): def _check_dsc_signature(self): "Check that the dsc signature matches what we are expecting" + if not self._verify_signature: + return try: gpg_info = self.dsc.get_gpg_info(( '/usr/share/keyrings/debian-keyring.gpg',