From 6734b0afba8cc8361392fd40b5b46a11ce0bce09 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Sun, 30 Jan 2011 16:07:02 -0700
Subject: Catch the case where there is no branch merge (#619979)

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

(limited to 'src')

diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py
index aae3105..9c1adf3 100644
--- a/src/pyfedpkg/__init__.py
+++ b/src/pyfedpkg/__init__.py
@@ -1023,7 +1023,10 @@ class PackageModule:
             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)
+        try:
+            merge = self.repo.git.config('--get', 'branch.%s.merge' % localbranch)
+        except git.errors.GitCommandError, e:
+            raise FedpkgError('Unable to find remote branch.  Use --dist')
         return(merge.split('/')[2])
 
     def _findmasterbranch(self):
-- 
cgit