summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Keating <jkeating@redhat.com>2011-01-30 16:13:04 -0700
committerJesse Keating <jkeating@redhat.com>2011-01-30 16:13:04 -0700
commit442fdd1dddf16ba63b4eff98bcb9583ab8841003 (patch)
tree6feaeefeb507cc20d23c48313fc8241ac7056291
parent6734b0afba8cc8361392fd40b5b46a11ce0bce09 (diff)
downloadfedora-packager-442fdd1dddf16ba63b4eff98bcb9583ab8841003.zip
fedora-packager-442fdd1dddf16ba63b4eff98bcb9583ab8841003.tar.gz
fedora-packager-442fdd1dddf16ba63b4eff98bcb9583ab8841003.tar.xz
Revert "Catch the case where there is no branch merge (#619979)"
This reverts commit 6734b0afba8cc8361392fd40b5b46a11ce0bce09. Fixing a bad commit message
-rw-r--r--src/pyfedpkg/__init__.py5
1 files changed, 1 insertions, 4 deletions
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):