Skip to contentSkip to conversation

toaster.bbclass: Support layers that are not Git repositories

PATCH New Peter Kjellerstedt 1 participant 1 message Jun 17

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 toaster.bbclass: Support layers that are not Git repositories

Not all layers are Git repositories, e.g., the workspace layer created by devtool.

---
 meta/classes/toaster.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/toaster.bbclass +2 -2
index 5878230062..f6a6f87de5 100644
@@ -32,12 +32,12 @@ python toaster_layerinfo_dumpdata() {
     import subprocess
 
     def _get_git_branch(layer_path):
-        branch = subprocess.check_output(['git', 'symbolic-ref', 'HEAD'], cwd=layer_path, text=True).strip()
+        branch = subprocess.run(['git', 'symbolic-ref', 'HEAD'], cwd=layer_path, text=True, stdout=subprocess.PIPE).stdout.strip()
         branch = branch.replace('refs/heads/', '').rstrip()
         return branch
 
     def _get_git_revision(layer_path):
-        revision = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=layer_path, text=True).strip()
+        revision = subprocess.run(['git', 'rev-parse', 'HEAD'], cwd=layer_path, text=True, stdout=subprocess.PIPE).stdout.strip()
         return revision
 
     def _get_url_map_name(layer_name):