From 442fdd1dddf16ba63b4eff98bcb9583ab8841003 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Sun, 30 Jan 2011 16:13:04 -0700
Subject: Revert "Catch the case where there is no branch merge (#619979)"

This reverts commit 6734b0afba8cc8361392fd40b5b46a11ce0bce09.
Fixing a bad commit message
---
 src/pyfedpkg/__init__.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/pyfedpkg')

diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py
index 9c1adf3..aae3105 100644
--- a/src/pyfedpkg/__init__.py
+++ b/src/pyfedpkg/__init__.py
@@ -1023,10 +1023,7 @@ class PackageModule:
             localbranch = self.repo.active_branch.name
         except TypeError, e:
             raise FedpkgError('Repo in inconsistent state: %s' % e)
-        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')
+        merge = self.repo.git.config('--get', 'branch.%s.merge' % localbranch)
         return(merge.split('/')[2])
 
     def _findmasterbranch(self):
-- 
cgit