summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-05-16 14:23:43 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-25 23:03:46 +0100
commit6cf74643e9b563c6384a0d23e172c8ea294b7210 (patch)
treef5eead3bc7aee890f599dddb8ab2f83dcb9551f5
parent7fcc9f5ead9d82067b27facf1b47a490b93489c7 (diff)
downloadopenembedded-core-contrib-6cf74643e9b563c6384a0d23e172c8ea294b7210.tar.gz
openembedded-core-contrib-6cf74643e9b563c6384a0d23e172c8ea294b7210.tar.bz2
openembedded-core-contrib-6cf74643e9b563c6384a0d23e172c8ea294b7210.zip
oeqa.utils.git: introduce GitRepo.rev_parse()
(From OE-Core rev: 55726e931536ed0cbd7b80588060b05a3145c934) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/buildperf/base.py2
-rw-r--r--meta/lib/oeqa/utils/git.py7
2 files changed, 8 insertions, 1 deletions
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index 30b8e47556..6a8d9feb02 100644
--- a/meta/lib/oeqa/buildperf/base.py
+++ b/meta/lib/oeqa/buildperf/base.py
@@ -114,7 +114,7 @@ class BuildPerfTestResult(unittest.TextTestResult):
"and OE_BUILDPERFTEST_GIT_BRANCH environment variables")
else:
if not rev:
- rev = self.repo.run_cmd(['rev-parse', 'HEAD'])
+ rev = self.repo.rev_parse('HEAD')
if not branch:
try:
# Strip 11 chars, i.e. 'refs/heads' from the beginning
diff --git a/meta/lib/oeqa/utils/git.py b/meta/lib/oeqa/utils/git.py
index 6a2987fbe8..647465467d 100644
--- a/meta/lib/oeqa/utils/git.py
+++ b/meta/lib/oeqa/utils/git.py
@@ -38,5 +38,12 @@ class GitRepo(object):
env.update(env_update)
return self._run_git_cmd_at(git_args, self.top_dir, env=env)
+ def rev_parse(self, revision):
+ """Do git rev-parse"""
+ try:
+ return self.run_cmd(['rev-parse', revision])
+ except GitError:
+ # Revision does not exist
+ return None