summaryrefslogtreecommitdiffstats
path: root/src/fedpkg.py
diff options
context:
space:
mode:
authorJesse Keating <jkeating@redhat.com>2010-08-02 14:19:10 -0700
committerJesse Keating <jkeating@redhat.com>2010-08-02 15:25:07 -0700
commitf63baa10fe44bea53783afbfc28b58e1e79e55d3 (patch)
tree895cf146ecaa85a7535d9a37b3e25b96fb577ee3 /src/fedpkg.py
parent6d5c91d3bdae3fe73d26289bf79875b732229535 (diff)
downloadfedora-packager-f63baa10fe44bea53783afbfc28b58e1e79e55d3.zip
fedora-packager-f63baa10fe44bea53783afbfc28b58e1e79e55d3.tar.gz
fedora-packager-f63baa10fe44bea53783afbfc28b58e1e79e55d3.tar.xz
Enable branch switching without any rpm content
Without rpm content, we can't init the packagemodule, so don't try to do that when switching branches.
Diffstat (limited to 'src/fedpkg.py')
-rwxr-xr-xsrc/fedpkg.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/fedpkg.py b/src/fedpkg.py
index e99c476..dadaa23 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -592,20 +592,15 @@ def srpm(args):
sys.exit(1)
def switch_branch(args):
- try:
- mymodule = pyfedpkg.PackageModule(args.path)
- except pyfedpkg.FedpkgError, e:
- log.error('Could not init the module')
- sys.exit(1)
if args.branch:
try:
- mymodule.switch_branch(args.branch)
+ pyfedpkg.switch_branch(args.branch, args.path)
except pyfedpkg.FedpkgError, e:
log.error('Unable to switch to another branch: %s' % e)
sys.exit(1)
else:
try:
- (locals, remotes) = mymodule.list_branches()
+ (locals, remotes) = pyfedpkg._list_branches(path=args.path)
except pyfedpkg.FedpkgError, e:
log.error('Unable to list branches: %s' % e)
sys.exit(1)