GitRepository/git_command: strip stderr output in case of error

In order to get rid of extra line feeds in exception message.

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

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 91c7dc258e7f0ecfce65db1237dd311069143d1c..b7c29356888feaa82c264822695229917cfcd099 100644 (file)
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -295,7 +295,8 @@ class GitRepository(object):
         except Exception as excobj:
             raise GitRepositoryError("Error running git %s: %s" % (command, excobj))
         if ret:
-            raise GitRepositoryError("Error running git %s: %s" % (command, stderr))
+            raise GitRepositoryError("Error running git %s: %s" %
+                                        (command, stderr.strip()))
 
 
     def _cmd_has_feature(self, command, feature):

diff --git a/tests/component/rpm/test_pq_rpm.py b/tests/component/rpm/test_pq_rpm.py
index 3ed9ad1c417ff246a0a15a0adefe534540ff9fbe..244f11bd186fdd72e052d9a1dfc7bdb6c5ee09c3 100644 (file)
--- a/tests/component/rpm/test_pq_rpm.py
+++ b/tests/component/rpm/test_pq_rpm.py
@@ -372,7 +372,7 @@ class TestPqRpm(RpmRepoTestBase):
         with open('my2.patch', 'w') as patch_file:
             patch_file.write('-this-does\n+not-apply\n')
         eq_(mock_pq(['import']), 1)
-        self._check_log(-2, "("
+        self._check_log(-1, "("
                              "Aborting|"
                              "Please, commit your changes or stash them|"
                              "gbp:error: Import failed.* You have local changes"