GitRepository/rev_parse: use _git_inout()
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Tue, 11 Sep 2012 12:08:13 +0000 (15:08 +0300)
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Tue, 3 Mar 2015 08:07:45 +0000 (10:07 +0200)
instead of the deprecated _git_getoutput() method.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
gbp/git/repository.py

index b7c29356888feaa82c264822695229917cfcd099..140723847694869ec8d7ba68aa517a71df4bc9e7 100644 (file)
@@ -970,10 +970,11 @@ class GitRepository(object):
         args = GitArgs("--quiet", "--verify")
         args.add_cond(short, '--short=%d' % short)
         args.add(name)
-        sha, ret = self._git_getoutput('rev-parse', args.args)
+        sha, stderr, ret = self._git_inout('rev-parse', args.args,
+                                            capture_stderr=True)
         if ret:
             raise GitRepositoryError("revision '%s' not found" % name)
-        return self.strip_sha1(sha[0], short)
+        return self.strip_sha1(sha.splitlines()[0], short)
 
     @staticmethod
     def strip_sha1(sha1, length=0):