diff options
author | Jesse Keating <jkeating@redhat.com> | 2010-08-12 00:07:36 -0700 |
---|---|---|
committer | Jesse Keating <jkeating@redhat.com> | 2010-08-12 00:07:36 -0700 |
commit | 67728d4e090ea7e6ae1fe0e72db70fdb634ee174 (patch) | |
tree | c87931e16dad6ce15c67d15db5669cad8aa0f33d | |
parent | 967a60e3501d123edfcde3cd8d48e3f3f2e62150 (diff) | |
download | fedora-packager-67728d4e090ea7e6ae1fe0e72db70fdb634ee174.tar.gz fedora-packager-67728d4e090ea7e6ae1fe0e72db70fdb634ee174.tar.xz fedora-packager-67728d4e090ea7e6ae1fe0e72db70fdb634ee174.zip |
Handle a case where the repo be borked. #620750
-rw-r--r-- | src/pyfedpkg/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index ba0b47a..e02191d 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -760,7 +760,10 @@ class PackageModule: def _findbranch(self): """Find the branch we're on""" - localbranch = self.repo.active_branch.name + try: + localbranch = self.repo.active_branch.name + except TypeError, e: + raise FedpkgError('Repo in inconsistent state: %s' % e) merge = self.repo.git.config('--get', 'branch.%s.merge' % localbranch) return(merge.split('/')[2]) |