aboutsummaryrefslogtreecommitdiff
path: root/gbp/scripts/pull.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2012-02-13 18:56:28 +0100
committerGuido Günther <agx@sigxcpu.org>2012-02-13 18:56:28 +0100
commit4a8db7a62af7a7834c62d0e389ac4b2178fb44ce (patch)
tree525016a0a296066a0f3d82745e9c99115d1550bd /gbp/scripts/pull.py
parentbca9f76135c5b4975b261018f0c9013243f38846 (diff)
Rename GbpOptionParserCommon common to GbpOptionParser
Diffstat (limited to 'gbp/scripts/pull.py')
-rwxr-xr-xgbp/scripts/pull.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py
index 9c6f2c5c..d50ffc23 100755
--- a/gbp/scripts/pull.py
+++ b/gbp/scripts/pull.py
@@ -22,7 +22,7 @@
import sys
import os, os.path
from gbp.command_wrappers import (Command, CommandExecFailed)
-from gbp.config import (GbpOptionParserCommon, GbpOptionGroup)
+from gbp.config import (GbpOptionParser, GbpOptionGroup)
from gbp.errors import GbpError
from gbp.git import GitRepositoryError
from gbp.deb.git import DebianGitRepository
@@ -70,8 +70,8 @@ def fast_forward_branch(branch, repo, options):
def main(argv):
retval = 0
- parser = GbpOptionParserCommon(command=os.path.basename(argv[0]), prefix='',
- usage='%prog [options] - safely update a repository from remote')
+ parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='',
+ usage='%prog [options] - safely update a repository from remote')
branch_group = GbpOptionGroup(parser, "branch options", "branch update and layout options")
parser.add_option_group(branch_group)
branch_group.add_option("--force", action="store_true", dest="force", default=False,