From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 4/8] oeqa.utils.metadata: fix retrieval of git branch and revision
Date: Wed, 28 Dec 2016 15:02:40 +0200 [thread overview]
Message-ID: <1482930164-15721-5-git-send-email-markus.lehtonen@linux.intel.com> (raw)
In-Reply-To: <1482930164-15721-1-git-send-email-markus.lehtonen@linux.intel.com>
Always return a valid branch name, or, '(nobranch)' if the current HEAD
is detached. Also, always return the hash of the commit object that HEAD
is pointing to. Previous code returned an incorrect branch name (or
crashed) e.g. in the case of detached HEAD.
[YOCTO #10590]
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
meta/lib/oeqa/utils/metadata.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index a389c6a..b732d37 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -72,11 +72,13 @@ def get_layers(layers):
layer_dict[layer_name] = OrderedDict()
try:
repo = Repo(layer, search_parent_directories=True)
- revision, branch = repo.head.object.name_rev.split()
except (InvalidGitRepositoryError, NoSuchPathError):
continue
- layer_dict[layer_name]['branch'] = branch
- layer_dict[layer_name]['revision'] = revision
+ layer_dict[layer_name]['revision'] = repo.head.commit.hexsha
+ try:
+ layer_dict[layer_name]['branch'] = repo.active_branch.name
+ except TypeError:
+ layer_dict[layer_name]['branch'] = '(nobranch)'
return layer_dict
def write_metadata_file(file_path, metadata):
--
2.6.6
next prev parent reply other threads:[~2016-12-28 13:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-28 13:02 [PATCH 0/8] oeqa.utils.metadata: update xml schema Markus Lehtonen
2016-12-28 13:02 ` [PATCH 1/8] oeqa.utils.metadata: re-organise host distro information Markus Lehtonen
2016-12-28 13:02 ` [PATCH 2/8] oeqa.utils.metadata: re-organise " Markus Lehtonen
2016-12-28 13:02 ` [PATCH 3/8] oeqa.utils.metadata: drop 'unknown' git data elements Markus Lehtonen
2017-01-04 15:30 ` Mariano Lopez
2017-01-05 9:19 ` Markus Lehtonen
2016-12-28 13:02 ` Markus Lehtonen [this message]
2016-12-28 13:02 ` [PATCH 5/8] oeqa.utils.metadata: rename 'revision' to 'commit' Markus Lehtonen
2016-12-28 13:02 ` [PATCH 6/8] oeqa.utils.metadata: add commit count information Markus Lehtonen
2016-12-28 13:02 ` [PATCH 7/8] oeqa.utils.metadata: have layer name as an attribute in xml Markus Lehtonen
2017-01-04 15:43 ` Mariano Lopez
2017-01-05 9:35 ` Markus Lehtonen
2016-12-28 13:02 ` [PATCH 8/8] oeqa.utils.metadata: add bitbake revision information Markus Lehtonen
2017-01-04 15:45 ` Mariano Lopez
2017-01-05 9:40 ` Markus Lehtonen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1482930164-15721-5-git-send-email-markus.lehtonen@linux.intel.com \
--to=markus.lehtonen@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.