diff options
| author | Guido Günther <agx@sigxcpu.org> | 2022-06-30 12:51:50 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2022-06-30 13:01:14 +0200 |
| commit | 666389baf306858d4954f653d6ed592cd5829865 (patch) | |
| tree | 848c6d28de777f5933030a8704dbf78d52ad2cc4 | |
| parent | 09338d25d3da84fff9cbd0a17d87762744546122 (diff) | |
export-orig: Allow for --pristine-tar-commit
No reason to restrict this to build-package
| -rw-r--r-- | docs/manpages/gbp-export-orig.xml | 15 | ||||
| -rwxr-xr-x | gbp/scripts/export_orig.py | 4 |
2 files changed, 16 insertions, 3 deletions
diff --git a/docs/manpages/gbp-export-orig.xml b/docs/manpages/gbp-export-orig.xml index c3a1393c..36b38b8f 100644 --- a/docs/manpages/gbp-export-orig.xml +++ b/docs/manpages/gbp-export-orig.xml @@ -31,6 +31,7 @@ <arg><option>--compression-level=</option><replaceable>LEVEL</replaceable></arg> <arg rep='repeat'><option>--component=</option><replaceable>component</replaceable></arg> <arg><option>--[no-]pristine-tar</option></arg> + <arg><option>--[no-]pristine-tar-commit</option></arg> <arg><option>--upstream-signatures=</option>[auto|on|off]</arg> </cmdsynopsis> </refsynopsisdiv> @@ -206,7 +207,16 @@ </para> </listitem> </varlistentry> - </variablelist> + <varlistentry> + <term><option>--pristine-tar-commit</option> + </term> + <listitem> + <para> + Commit the pristine-tar delta to the pristine-tar branch if a new + tarball was generated and the pristine-tar data isn't already there. + </para> + </listitem> + </varlistentry> <varlistentry> <term><option>--upstream-signatures=</option>[auto|on|off] </term> @@ -215,7 +225,8 @@ Whether to export with upstream signatures. </para> </listitem> - </varlistentry> + </varlistentry> + </variablelist> </refsect1> <refsect1> <title>EXAMPLES</title> diff --git a/gbp/scripts/export_orig.py b/gbp/scripts/export_orig.py index ed4c64fb..4475da3e 100755 --- a/gbp/scripts/export_orig.py +++ b/gbp/scripts/export_orig.py @@ -165,7 +165,7 @@ def maybe_pristine_tar_commit(repo, source, options, output_dir, orig_files): else: upstream_tree = git_archive_get_upstream_tree(repo, source, options) archive = os.path.join(output_dir, orig_files[0]) - gbp.log.debug("Adding %s to pristine-tar branch" % archive) + gbp.log.info("Adding %s to pristine-tar branch" % archive) repo.pristine_tar.commit(archive, upstream_tree) @@ -309,6 +309,8 @@ def build_parser(name): help="use upstream signature, default is auto", type='tristate') orig_group.add_config_file_option("component", action="append", metavar='COMPONENT', dest="components") + orig_group.add_boolean_config_file_option(option_name="pristine-tar-commit", + dest="pristine_tar_commit") branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch") branch_group.add_boolean_config_file_option(option_name="submodules", dest="with_submodules") return parser |