From 774cb7a57ed2bc8af1b8ed0ef10cf758587d8992 Mon Sep 17 00:00:00 2001
From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Mon, 25 Mar 2013 15:57:24 +0200
Subject: [PATCH] GitRepository: raise GitRepositoryError instead of GbpError

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
 gbp/git/repository.py       | 6 +++---
 gbp/scripts/import_orig.py  | 2 +-
 tests/09_test_write_tree.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 782804b..58950ff 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -23,7 +23,6 @@ from collections import defaultdict
 import select
 
 import gbp.log as log
-from gbp.errors import GbpError
 from gbp.git.modifier import GitModifier
 from gbp.git.commit import GitCommit
 from gbp.git.errors import GitError
@@ -1362,7 +1361,8 @@ class GitRepository(object):
         if not ret:
             return self.strip_sha1(sha1)
         else:
-            raise GbpError("Failed to hash %s: %s" % (filename, stderr))
+            raise GitRepositoryError("Failed to hash %s: %s" % (filename,
+                                                                stderr))
 #}
 
 #{ Comitting
@@ -1527,7 +1527,7 @@ class GitRepository(object):
         if not ret:
             return self.strip_sha1(sha1)
         else:
-            raise GbpError("Failed to commit tree: %s" % stderr)
+            raise GitRepositoryError("Failed to commit tree: %s" % stderr)
 
 #{ Commit Information
 
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py
index 6256431..2efb4b3 100644
--- a/gbp/scripts/import_orig.py
+++ b/gbp/scripts/import_orig.py
@@ -384,7 +384,7 @@ def main(argv):
         except (gbpc.CommandExecFailed, GitRepositoryError) as err:
             msg = err.__str__() if len(err.__str__()) else ''
             raise GbpError("Import of %s failed: %s" % (source.path, msg))
-    except GbpError as err:
+    except (GbpError, GitRepositoryError) as err:
         if len(err.__str__()):
             gbp.log.err(err)
         ret = 1
diff --git a/tests/09_test_write_tree.py b/tests/09_test_write_tree.py
index 7147da5..55a1da6 100644
--- a/tests/09_test_write_tree.py
+++ b/tests/09_test_write_tree.py
@@ -62,7 +62,7 @@ class TestWriteTree(testutils.DebianGitTestRepo):
         # commit the same tree again using the previous commit as parent
         self.repo.commit_tree(sha1, "second commit", parents=[commit])
         # commit the same tree again using a non existant parent
-        self.assertRaises(gbp.errors.GbpError,
+        self.assertRaises(gbp.git.GitRepositoryError,
                           self.repo.commit_tree,
                           sha1,
                           "failed commit",
-- 
2.7.4