diff options
author | Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> | 2011-04-13 03:33:14 -0300 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2011-07-23 15:51:21 +0200 |
commit | 0ecd9f70aef51e26c13a0fcc241a3dcb934aeaaf (patch) | |
tree | cae3c6bb8668ee71ad18041ed20bf498c068d1f5 /git-buildpackage | |
parent | 8ce3500b66827904504c4b62331520c898103828 (diff) |
git-buildpackage: Add upstream-tree option
to specify where the upstream tarball should be created from. The
default is to create the upstream tarball from the exact tag and fail
otherwise. To create the upstream tarball from the tip of the upstream
branch use 'branch'.
Based on a patch by Ricardo Salveti de Araujo
Diffstat (limited to 'git-buildpackage')
-rwxr-xr-x | git-buildpackage | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/git-buildpackage b/git-buildpackage index 31fc6ce..676129d 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -1,7 +1,7 @@ #!/usr/bin/python -u # vim: set fileencoding=utf-8 : # -# (C) 2006-2010 Guido Guenther <agx@sigxcpu.org> +# (C) 2006-2011 Guido Guenther <agx@sigxcpu.org> # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -209,14 +209,12 @@ def pristine_tar_build_orig(repo, cp, output_dir, options): def git_archive_build_orig(repo, cp, output_dir, options): """build orig using git-archive""" - # --upstream-branch was given on the command line, so use this: - if options.upstream_branch != GbpOptionParser.defaults['upstream-branch']: + if options.upstream_tree == 'tag': + upstream_tree = build_tag(options.upstream_tag, cp['Upstream-Version']) + elif options.upstream_tree == 'branch': upstream_tree = options.upstream_branch else: - upstream_tree = build_tag(options.upstream_tag, cp['Upstream-Version']) - # fall back to the upstream-branch tip if the tag doesn't exist - if not repo.has_treeish(upstream_tree): - upstream_tree = GbpOptionParser.defaults['upstream-branch'] + raise GbpError, "Unknown value %s" % options.upstream_tree gbp.log.info("%s does not exist, creating from '%s'" % (du.orig_file(cp, options.comp_type), upstream_tree)) @@ -361,6 +359,7 @@ def parse_args(argv, prefix): tag_group.add_config_file_option(option_name="keyid", dest="keyid") tag_group.add_config_file_option(option_name="debian-tag", dest="debian_tag") tag_group.add_config_file_option(option_name="upstream-tag", dest="upstream_tag") + orig_group.add_config_file_option(option_name="upstream-tree", dest="upstream_tree") orig_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar") orig_group.add_config_file_option(option_name="force-create", dest="force_create", help="force creation of orig.tar.gz", action="store_true") |