diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-05-11 11:29:24 +0300 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-08-10 11:35:12 +0300 |
| commit | 4ee1ce3ec6114bd5573d2eae5aca60e3e631bc5b (patch) | |
| tree | 30597c971bdef5bc7dca13b08482135593079287 /gbp/scripts/pq_rpm.py | |
| parent | 3399f36bd113942184144ffa62038d569ef1333d (diff) | |
| download | git-buildpackage-4ee1ce3ec6114bd5573d2eae5aca60e3e631bc5b.tar.gz git-buildpackage-4ee1ce3ec6114bd5573d2eae5aca60e3e631bc5b.tar.bz2 git-buildpackage-4ee1ce3ec6114bd5573d2eae5aca60e3e631bc5b.zip | |
pq-rpm: add new --pq-branch option
Adds a new command line option '--pq-branch' to set the name of
patch-queue branches. Changes the defaults pq-branch name for rpm tools
to 'development/%(branch)s' (instead of the old
'patch-queue/%(branch)s').
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/scripts/pq_rpm.py')
| -rwxr-xr-x | gbp/scripts/pq_rpm.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py index 73d4553d..42d47e83 100755 --- a/gbp/scripts/pq_rpm.py +++ b/gbp/scripts/pq_rpm.py @@ -279,7 +279,7 @@ def rebase_pq(repo, branch, options): if not upstream_commit: raise GbpError, ("Couldn't find upstream version %s. Don't know on what base to import." % spec.version) - switch_to_pq_branch(repo, branch) + switch_to_pq_branch(repo, branch, options) GitCommand("rebase")([upstream_commit]) @@ -318,6 +318,10 @@ def main(argv): parser.add_config_file_option(option_name="upstream-tag", dest="upstream_tag") parser.add_config_file_option(option_name="spec-file", dest="spec_file") parser.add_config_file_option(option_name="packaging-dir", dest="packaging_dir") + parser.add_config_file_option(option_name="packaging-branch", + dest="packaging_branch", + help="Branch the packaging is being maintained on. Only relevant if a invariable/single pq-branch is defined, in which case this is used as the 'base' branch. Default is '%(packaging-branch)s'") + parser.add_config_file_option(option_name="pq-branch", dest="pq_branch") parser.add_option("--export-rev", action="store", dest="export_rev", default="", help="Export patches from treeish object TREEISH instead of head of patch-queue branch", metavar="TREEISH") |