GitRepository: raise GitRepositoryError instead of GbpError

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 140723847694869ec8d7ba68aa517a71df4bc9e7..3029e74776885aa4fb3b22c7c0d65173e019447d 100644 (file)
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -24,7 +24,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
@@ -1429,7 +1428,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
@@ -1594,7 +1594,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 61dc8229f873cf7cdaa1f241fa3c707e741ec2f2..84905617f99d570c8da8e3f949ba3206ef6ed7d7 100644 (file)
--- a/gbp/scripts/import_orig.py
+++ b/gbp/scripts/import_orig.py
@@ -412,7 +412,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 bad362c8575d50eb8def524bd5a813e0ba27dcc5..a73752539023ed8f784200b8a99412598248b335 100644 (file)
--- a/tests/09_test_write_tree.py
+++ b/tests/09_test_write_tree.py
@@ -63,7 +63,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",