summaryrefslogtreecommitdiff
path: root/gbp/config.py
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2012-01-12 15:39:55 +0200
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-11-14 14:22:11 +0200
commitb0605bccbe44548a4e8a4431b795e440d5de6fac (patch)
tree34459c4e9ce8306eba2b0923702ca0a013f1c820 /gbp/config.py
parent1e3d5d835f492daf11995eb5ba27bb0c950cd7b8 (diff)
downloadgit-buildpackage-b0605bccbe44548a4e8a4431b795e440d5de6fac.tar.gz
git-buildpackage-b0605bccbe44548a4e8a4431b795e440d5de6fac.tar.bz2
git-buildpackage-b0605bccbe44548a4e8a4431b795e440d5de6fac.zip
Introduce git-import-orig-rpm tool
Initial version of the git-import-orig-rpm: version of git-import-orig intended for maintaining rpm packages. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/config.py')
-rw-r--r--gbp/config.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/gbp/config.py b/gbp/config.py
index a211e8b1..62b8dd2c 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -608,6 +608,8 @@ class GbpOptionParserRpm(GbpOptionParser):
'rpmbuild-srpmdir' : 'SRPMS',
'rpmbuild-buildrootdir' : 'BUILDROOT',
'patch-export' : 'False',
+ 'merge' : 'False',
+ 'pristine-tarball-name' : 'auto',
})
help = dict(GbpOptionParser.help)
@@ -637,6 +639,9 @@ class GbpOptionParserRpm(GbpOptionParser):
'patch-export':
"Create patches between upstream and export-treeish, default "
"is '%(patch-export)s'",
+ 'pristine-tarball-name':
+ "Filename to record to pristine-tar, set to 'auto' to not "
+ "mangle the file name, default is '%(pristine-tarball-name)s'",
})
# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·: