diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2019-12-17 00:10:01 +0100 |
|---|---|---|
| committer | Christian Göttsche <cgzones@googlemail.com> | 2020-01-21 17:36:53 +0100 |
| commit | 2f1c1577e74c36d17aa9f8956e95c42018c71925 (patch) | |
| tree | b864c8b9ebe646515d1451a8d360e81a88fd394b /gbp/scripts | |
| parent | bddd221ee61f8fca61f5a7e17ee47019862c1da7 (diff) | |
add option to export tarballs with upstream signature
Add option `--upstream-signatures=[on|auto|off]` to export-orig.
Add option `--git-upstream-signatures=[on|auto|off]` to buildpackage.
Closes: 872864
Diffstat (limited to 'gbp/scripts')
| -rwxr-xr-x | gbp/scripts/buildpackage.py | 2 | ||||
| -rwxr-xr-x | gbp/scripts/export_orig.py | 6 | ||||
| -rwxr-xr-x | gbp/scripts/push.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 2aca53df..9b3d67fa 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -395,6 +395,8 @@ def build_parser(name, prefix=None): help="Compression type, default is '%(compression)s'") orig_group.add_config_file_option(option_name="compression-level", dest="comp_level", help="Compression level, default is '%(compression-level)s'") + orig_group.add_config_file_option(option_name="upstream-signatures", dest="upstream_signatures", + help="use upstream signatures, default is auto", type='tristate') orig_group.add_config_file_option("component", action="append", metavar='COMPONENT', dest="components") branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch") diff --git a/gbp/scripts/export_orig.py b/gbp/scripts/export_orig.py index 13be4f91..cad8297b 100755 --- a/gbp/scripts/export_orig.py +++ b/gbp/scripts/export_orig.py @@ -113,7 +113,8 @@ def pristine_tar_build_origs(repo, source, output_dir, options): source.upstream_tarball_name(comp.type)))) repo.create_upstream_tarball_via_pristine_tar(source, output_dir, - comp) + comp, + options.upstream_signatures) for component in options.components: gbp.log.info("Creating %s" % os.path.abspath(os.path.join(output_dir, @@ -121,6 +122,7 @@ def pristine_tar_build_origs(repo, source, output_dir, options): repo.create_upstream_tarball_via_pristine_tar(source, output_dir, comp, + options.upstream_signatures, component=component) return True except GitRepositoryError: @@ -303,6 +305,8 @@ def build_parser(name): help="Compression type, default is '%(compression)s'") orig_group.add_config_file_option(option_name="compression-level", dest="comp_level", help="Compression level, default is '%(compression-level)s'") + orig_group.add_config_file_option(option_name="upstream-signatures", dest="upstream_signatures", + help="use upstream signature, default is auto", type='tristate') orig_group.add_config_file_option("component", action="append", metavar='COMPONENT', dest="components") branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch") diff --git a/gbp/scripts/push.py b/gbp/scripts/push.py index c897396e..8233ace8 100755 --- a/gbp/scripts/push.py +++ b/gbp/scripts/push.py @@ -164,7 +164,7 @@ def main(argv): to_push['refs'].append((ref, get_push_src(repo, ref, utag))) if options.pristine_tar: - commit = repo.get_pristine_tar_commit(source) + commit, _ = repo.get_pristine_tar_commit(source) if commit: ref = 'refs/heads/pristine-tar' to_push['refs'].append((ref, get_push_src(repo, ref, commit))) |