diff options
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/buildperf/base.py | 7 | ||||
| -rw-r--r-- | meta/lib/oeqa/utils/git.py | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py index 6a8d9feb02..adc3da3e2c 100644 --- a/meta/lib/oeqa/buildperf/base.py +++ b/meta/lib/oeqa/buildperf/base.py @@ -116,12 +116,9 @@ class BuildPerfTestResult(unittest.TextTestResult): if not rev: rev = self.repo.rev_parse('HEAD') if not branch: - try: - # Strip 11 chars, i.e. 'refs/heads' from the beginning - branch = self.repo.run_cmd(['symbolic-ref', 'HEAD'])[11:] - except GitError: + branch = self.repo.get_current_branch() + if not branch: log.debug('Currently on detached HEAD') - branch = None return str(rev), str(branch) def addSuccess(self, test): diff --git a/meta/lib/oeqa/utils/git.py b/meta/lib/oeqa/utils/git.py index 647465467d..0fc8112321 100644 --- a/meta/lib/oeqa/utils/git.py +++ b/meta/lib/oeqa/utils/git.py @@ -46,4 +46,12 @@ class GitRepo(object): # Revision does not exist return None + def get_current_branch(self): + """Get current branch""" + try: + # Strip 11 chars, i.e. 'refs/heads' from the beginning + return self.run_cmd(['symbolic-ref', 'HEAD'])[11:] + except GitError: + return None + |