diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-01-12 15:35:37 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-06-05 14:20:04 +0300 |
| commit | 73e41dcc18c07f017a67e3c4bf8fa085d866d565 (patch) | |
| tree | 1e7465d606449d87391ec30fae599155b18b1a8f /gbp/config.py | |
| parent | 127fa79a4189828e528fbbe0b5ac9892cf259c4c (diff) | |
| download | git-buildpackage-73e41dcc18c07f017a67e3c4bf8fa085d866d565.tar.gz git-buildpackage-73e41dcc18c07f017a67e3c4bf8fa085d866d565.tar.bz2 git-buildpackage-73e41dcc18c07f017a67e3c4bf8fa085d866d565.zip | |
Add 'packaging-branch' cmdline option
This is the counterpart of 'debian-branch' (basically identical to that)
to not confuse rpm maintainers.
Also, adds this option to gbp-clone and gbp-pull commands (as an
alternative to the 'debian-branch option), which are usable for RPM in
their current form.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/config.py')
| -rw-r--r-- | gbp/config.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gbp/config.py b/gbp/config.py index f64e7908..9da847fd 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -94,6 +94,7 @@ class GbpOptionParser(OptionParser): @type def_config_files: list """ defaults = { 'debian-branch' : 'master', + 'packaging-branch' : 'master', 'upstream-branch' : 'upstream', 'upstream-tree' : 'TAG', 'pristine-tar' : 'False', @@ -165,6 +166,10 @@ class GbpOptionParser(OptionParser): 'debian-branch': ("Branch the Debian package is being developed on, " "default is '%(debian-branch)s'"), + 'packaging-branch': + ("Branch the packaging is being maintained on, " + "rpm counterpart of the 'debian-branch' option, " + "default is '%(packaging-branch)s'"), 'upstream-branch': "Upstream branch, default is '%(upstream-branch)s'", 'upstream-tree': |