diff options
Diffstat (limited to 'src/pyfedpkg')
| -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]) |