aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/config.py
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@canonical.com>2011-04-13 03:33:14 -0300
committerGuido Günther <agx@sigxcpu.org>2011-07-23 15:51:21 +0200
commit0ecd9f70aef51e26c13a0fcc241a3dcb934aeaaf (patch)
treecae3c6bb8668ee71ad18041ed20bf498c068d1f5 /gbp/config.py
parent8ce3500b66827904504c4b62331520c898103828 (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 'gbp/config.py')
-rw-r--r--gbp/config.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/gbp/config.py b/gbp/config.py
index d4ed4b49..be20784f 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -59,6 +59,7 @@ class GbpOptionParser(OptionParser):
'cleaner' : 'debuild -d clean',
'debian-branch' : 'master',
'upstream-branch' : 'upstream',
+ 'upstream-tree' : 'tag',
'pristine-tar' : 'False',
'filter-pristine-tar' : 'False',
'sign-tags' : 'False',
@@ -114,6 +115,8 @@ class GbpOptionParser(OptionParser):
"branch the Debian package is being developed on, default is '%(debian-branch)s'",
'upstream-branch':
"upstream branch, default is '%(upstream-branch)s'",
+ 'upstream-tree':
+ "where to generate the upstream tarball from (tag or branch), default is '%(upstream-tree)s'",
'debian-tag':
"format string for debian tags, default is '%(debian-tag)s'",
'upstream-tag':