From 67728d4e090ea7e6ae1fe0e72db70fdb634ee174 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Thu, 12 Aug 2010 00:07:36 -0700
Subject: Handle a case where the repo be borked. #620750

---
 src/pyfedpkg/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/pyfedpkg')

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])
 
-- 
cgit