PristineTar: Don't fail if pristine-tar does't support signatures

diff --git a/gbp/pkg/pristinetar.py b/gbp/pkg/pristinetar.py
index 3cadf482cb842e5bc6fa1c70e0fbddf02ca8df1d..5c0892b754e3f001dbcfc3e246165dce3d637e74 100644 (file)
--- a/gbp/pkg/pristinetar.py
+++ b/gbp/pkg/pristinetar.py
@@ -92,7 +92,7 @@ class PristineTar(Command):
         """
         args = ['checkout', archive]
         self.run_error = 'Pristine-tar couldn\'t checkout "%s": {stderr_or_reason}' % os.path.basename(archive)
-        if signaturefile:
+        if signaturefile and self.has_feature_sig():
             args += ['-s', signaturefile]
         self.__call__(args, quiet=quiet)
 
@@ -109,7 +109,7 @@ class PristineTar(Command):
         args = ['commit', archive, upstream]
         self.run_error = ("Couldn't commit to '%s' with upstream '%s': {stderr_or_reason}" %
                           (self.branch, upstream))
-        if signaturefile:
+        if signaturefile and self.has_feature_sig():
             args += ['-s', signaturefile]
         self.__call__(args, quiet=quiet)
 

diff --git a/tests/doctests/test_PristineTar.py b/tests/doctests/test_PristineTar.py
index 825ef04289582dade667249d092723e828a7155f..15c614cf42be8d946e04b1a29aa341592ae36a36 100644 (file)
--- a/tests/doctests/test_PristineTar.py
+++ b/tests/doctests/test_PristineTar.py
@@ -169,7 +169,7 @@ def test_pristine_tar_checkout_with_sig():
     >>> os.unlink(sf)
     >>> repo.pristine_tar.checkout('upstream', '1.0', 'gzip', '..',
     ...                             signature=True)
-    >>> os.path.exists(sf)
+    >>> os.path.exists(sf) or not repo.pristine_tar.has_feature_sig()
     True
     """