import_orig: Drop all upstream signatures with --upstream-signatures=off

This makes sure we don't use spurious files as signatures

diff --git a/gbp/pkg/upstreamsource.py b/gbp/pkg/upstreamsource.py
index 384513e52ae195c1e017bbc510f44cbda069ce87..2d9ca245ba7b4f555b47a7544ce4ffc4490431ed 100644 (file)
--- a/gbp/pkg/upstreamsource.py
+++ b/gbp/pkg/upstreamsource.py
@@ -104,6 +104,10 @@ class UpstreamSource(object):
     def signaturefile(self):
         return self._sig
 
+    @signaturefile.setter
+    def signaturefile(self, sig):
+        self._sig = sig
+
     def unpack(self, dir, filters=None):
         """
         Unpack packed upstream sources into a given directory

diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py
index ad0141e62632e654dce0148d4e53af256559e5d6..3a0d2d97fc696d7f3fb8a894ca0046a7fbe66fad 100644 (file)
--- a/gbp/scripts/import_orig.py
+++ b/gbp/scripts/import_orig.py
@@ -519,6 +519,8 @@ def main(argv):
                         # Enforce signature file exists with --upstream-signatures=on
                         if options.upstream_signatures.is_on() and not source.signaturefile:
                             raise GbpError("%s does not have a signature file" % source.path)
+                        elif options.upstream_signatures.is_off():
+                            source.signaturefile = None
                     # For all practical purposes we're interested in pristine_orig's path
                     if pristine_orig != sources[0].path:
                         sources[0]._path = pristine_orig