diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-01-12 15:35:20 +0200 |
---|---|---|
committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-11-14 14:22:11 +0200 |
commit | 61fb96fa54a94cd7f7e27edcc1b9e72655c6cee1 (patch) | |
tree | d0ff0f9e67def485dc204eb2331613f79d31f0c2 /gbp/scripts/pull.py | |
parent | 2d72c556e17230258fb9f8366bf4280436e5f82e (diff) | |
download | git-buildpackage-61fb96fa54a94cd7f7e27edcc1b9e72655c6cee1.tar.gz git-buildpackage-61fb96fa54a94cd7f7e27edcc1b9e72655c6cee1.tar.bz2 git-buildpackage-61fb96fa54a94cd7f7e27edcc1b9e72655c6cee1.zip |
Rename internal var debian_branch -> packaging_branch
This is done in sake of more general purpose naming, intended for
enabling rpm support.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/scripts/pull.py')
-rwxr-xr-x | gbp/scripts/pull.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py index 50b04895..206133e4 100755 --- a/gbp/scripts/pull.py +++ b/gbp/scripts/pull.py @@ -115,7 +115,7 @@ def build_parser(name): branch_group.add_option("--redo-pq", action="store_true", dest="redo_pq", default=False, help="redo the patch queue branch after a pull. Warning: this drops the old patch-queue branch") branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch") - branch_group.add_config_file_option(option_name="debian-branch", dest="debian_branch") + branch_group.add_config_file_option(option_name="debian-branch", dest="packaging_branch") branch_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar") branch_group.add_option("--depth", action="store", dest="depth", default=0, help="git history depth (for deepening shallow clones)") @@ -162,7 +162,7 @@ def main(argv): else: raise - for branch in [ options.debian_branch, options.upstream_branch ]: + for branch in [ options.packaging_branch, options.upstream_branch ]: if repo.has_branch(branch): branches.add(branch) @@ -195,7 +195,7 @@ def main(argv): retval = 2 if options.redo_pq: - repo.set_branch(options.debian_branch) + repo.set_branch(options.packaging_branch) Command("gbp-pq")(["drop"]) Command("gbp-pq")(["import"]) |