From 0277c5477fd86ef1871b7b6cf04bc84192a0330d Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sat, 24 Nov 2018 19:22:34 +0100 Subject: PristineTar: Don't fail if pristine-tar does't support signatures --- gbp/pkg/pristinetar.py | 4 ++-- tests/doctests/test_PristineTar.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gbp/pkg/pristinetar.py b/gbp/pkg/pristinetar.py index 3cadf482..5c0892b7 100644 --- 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 825ef042..15c614cf 100644 --- 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 """ -- cgit v1.2.3