[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4090/8267] oeqa.utils.metadata: rename 'revision' to 'commit'



commit ceed2c7eb51e7d5ff2c7bac2fed79742edeab5e4
Author: Markus Lehtonen <markus lehtonen linux intel com>
Date:   Fri Jan 13 15:12:41 2017 +0200

    oeqa.utils.metadata: rename 'revision' to 'commit'
    
    Revision is a bit vague and could point to a tag, for example. Git
    commit objects are unambiguous and persistent so be explicit that the
    element should contain git commit hash.
    
    [YOCTO #10590]
    
    (From OE-Core rev: a6521b89e86ddba6bd646dd3974d7b0390323b56)
    
    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>

 meta/lib/oeqa/utils/metadata.py |    2 +-
 scripts/oe-selftest             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index b732d37..2f7e8f2 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -74,7 +74,7 @@ def get_layers(layers):
             repo = Repo(layer, search_parent_directories=True)
         except (InvalidGitRepositoryError, NoSuchPathError):
             continue
-        layer_dict[layer_name]['revision'] = repo.head.commit.hexsha
+        layer_dict[layer_name]['commit'] = repo.head.commit.hexsha
         try:
             layer_dict[layer_name]['branch'] = repo.active_branch.name
         except TypeError:
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index 78806a6..5b045e8 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -631,7 +631,7 @@ def main():
             layer_info = ''
             for layer, values in metadata['layers'].items():
                 layer_info = '%s%-17s = %s:%s\n' % (layer_info, layer,
-                              values.get('branch', '(nogit)'), values.get('revision', '0'*40))
+                              values.get('branch', '(nogit)'), values.get('commit', '0'*40))
             msg = 'Selftest for build %s of %s for machine %s on %s\n\n%s' % (
                    log_prefix[12:], metadata['distro']['pretty_name'],
                    metadata['machine'], metadata['hostname'], layer_info)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]