From 3fb7516d72790476d21bae1587a14fbb21aed059 Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mattia@debian.org>
Date: Mon, 5 Aug 2019 13:50:33 +0200
Subject: [PATCH] Default to checking signatures while pulling a .dsc.

Signed-off-by: Mattia Rizzolo <mattia@debian.org>
---
 ubuntutools/archive.py           |  6 +++---
 ubuntutools/test/test_archive.py | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ubuntutools/archive.py b/ubuntutools/archive.py
index 0e6e219..91d8861 100644
--- a/ubuntutools/archive.py
+++ b/ubuntutools/archive.py
@@ -236,7 +236,7 @@ class SourcePackage(object):
                 yield self._mirror_url(mirror, name)
         yield self._lp_url(name)
 
-    def pull_dsc(self):
+    def pull_dsc(self, verify_signature=True):
         "Retrieve dscfile and parse"
         if self._dsc_source:
             parsed = urlparse(self._dsc_source)
@@ -248,7 +248,7 @@ class SourcePackage(object):
             url = self._lp_url(self.dsc_name)
         self._download_dsc(url)
 
-        self._check_dsc()
+        self._check_dsc(verify_signature=verify_signature)
 
     def _download_dsc(self, url):
         "Download specified dscfile and parse"
@@ -474,7 +474,7 @@ class DebianSourcePackage(SourcePackage):
     def pull_dsc(self, verify_signature=True):
         "Retrieve dscfile and parse"
         try:
-            super(DebianSourcePackage, self).pull_dsc()
+            super(DebianSourcePackage, self).pull_dsc(verify_signature)
             return
         except DownloadError:
             pass
diff --git a/ubuntutools/test/test_archive.py b/ubuntutools/test/test_archive.py
index 38c1a63..077ca83 100644
--- a/ubuntutools/test/test_archive.py
+++ b/ubuntutools/test/test_archive.py
@@ -162,7 +162,7 @@ class LocalSourcePackageTestCase(unittest.TestCase):
                                  dscfile='test-data/example_1.0-1.dsc',
                                  workdir=self.workdir)
         pkg.quiet = True
-        pkg.pull()
+        pkg.pull(verify_signature=False)
         pkg.unpack()
 
     def test_workdir_srcpkg_noinfo(self):
@@ -174,7 +174,7 @@ class LocalSourcePackageTestCase(unittest.TestCase):
                                                       'example_1.0-1.dsc'),
                                  workdir=self.workdir)
         pkg.quiet = True
-        pkg.pull()
+        pkg.pull(verify_signature=False)
         pkg.unpack()
 
     def test_workdir_srcpkg_info(self):
@@ -187,7 +187,7 @@ class LocalSourcePackageTestCase(unittest.TestCase):
                                                       'example_1.0-1.dsc'),
                                  workdir=self.workdir)
         pkg.quiet = True
-        pkg.pull()
+        pkg.pull(verify_signature=False)
         pkg.unpack()
 
     def test_verification(self):
@@ -202,7 +202,7 @@ class LocalSourcePackageTestCase(unittest.TestCase):
                                  dscfile='test-data/example_1.0-1.dsc',
                                  workdir=self.workdir)
         pkg.quiet = True
-        pkg.pull()
+        pkg.pull(verify_signature=False)
 
     def test_pull(self):
         pkg = self.SourcePackage('example', '1.0-1', 'main',
@@ -210,7 +210,7 @@ class LocalSourcePackageTestCase(unittest.TestCase):
 
         pkg.url_opener = self.url_opener
         pkg.quiet = True
-        pkg.pull()
+        pkg.pull(verify_signature=False)
 
     def test_mirrors(self):
         mirror = 'http://mirror'
@@ -226,7 +226,7 @@ class LocalSourcePackageTestCase(unittest.TestCase):
                                  workdir=self.workdir, mirrors=[mirror])
         pkg.url_opener = url_opener
         pkg.quiet = True
-        pkg.pull()
+        pkg.pull(verify_signature=False)
 
     def test_dsc_missing(self):
         self.mock_http.side_effect = self.request_404
@@ -263,7 +263,7 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase):
                                                                 debsec_mirror])
         pkg.quiet = True
         pkg.url_opener = url_opener
-        pkg.pull()
+        pkg.pull(verify_signature=False)
         pkg.unpack()
 
     def test_dsc_missing(self):
@@ -280,7 +280,7 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase):
         pkg = self.SourcePackage('example', '1.0-1', 'main',
                                  workdir=self.workdir, mirrors=[mirror])
         pkg.url_opener = self.url_opener
-        pkg.pull()
+        pkg.pull(verify_signature=False)
 
     def test_dsc_badsig(self):
         mirror = 'http://mirror'