diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-08-03 19:06:30 -0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-08-03 19:39:11 -0300 |
| commit | cfd884f1ff59e49e66e3aa156565cf79f2880a14 (patch) | |
| tree | 246fb80d5b9c1cffec65658051a0930497115262 | |
| parent | c49a0381f496fae4f94a1fbeed278f014ae556b7 (diff) | |
pristine-tar: don't print checkout errors twice
similar to f1c3a6f4dc6ceee5be5d49b4d193da8fd36c8920
| -rw-r--r-- | gbp/deb/git.py | 2 | ||||
| -rw-r--r-- | gbp/deb/pristinetar.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gbp/deb/git.py b/gbp/deb/git.py index 3edd4546..ee0390ae 100644 --- a/gbp/deb/git.py +++ b/gbp/deb/git.py @@ -315,7 +315,7 @@ class DebianGitRepository(PkgGitRepository): output = source.upstream_tarball_name(comp.type, component=component) try: self.pristine_tar.checkout(source.name, source.upstream_version, comp.type, output_dir, - component=component) + component=component, quiet=True) except Exception as e: raise GitRepositoryError("Error creating %s: %s" % (output, e)) return True diff --git a/gbp/deb/pristinetar.py b/gbp/deb/pristinetar.py index 92c627b1..2f52f3ac 100644 --- a/gbp/deb/pristinetar.py +++ b/gbp/deb/pristinetar.py @@ -44,7 +44,8 @@ class DebianPristineTar(PristineTar): return super(DebianPristineTar, self).has_commit(name_regexp) - def checkout(self, package, version, comp_type, output_dir, component=None): + def checkout(self, package, version, comp_type, output_dir, component=None, + quiet=False): """ Checkout the orig tarball for package I{package} of I{version} and compression type I{comp_type} to I{output_dir} @@ -63,4 +64,4 @@ class DebianPristineTar(PristineTar): comp_type, output_dir, component=component) - super(DebianPristineTar, self).checkout(name) + super(DebianPristineTar, self).checkout(name, quiet=quiet) |