1 files changed, 7 insertions, 5 deletions

diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass
index 5af593ae46..62650be675 100644
--- a/meta/classes/metadata_scm.bbclass
+++ b/meta/classes/metadata_scm.bbclass
@@ -60,16 +60,18 @@ def base_get_metadata_svn_revision(path, d):
         return revision
 
 def base_get_metadata_git_branch(path, d):
-        branch = bb.process.run('cd %s; git branch | grep "^* " | tr -d "* "' % path)[0]
+        branch = os.popen('cd %s; git branch 2>&1 | grep "^* " | tr -d "* "' % path).read()
 
         if len(branch) != 0:
                 return branch
         return "<unknown>"
 
 def base_get_metadata_git_revision(path, d):
-        rev = bb.process.run("cd %s; git log -n 1 --pretty=oneline" % path)[0]
-        if len(rev) != 0:
-                rev = rev.split(" ")[0]
-                return rev
+        f = os.popen("cd %s; git log -n 1 --pretty=oneline -- 2>&1" % path)
+        data = f.read()
+        if f.close() is None:        
+                rev = data.split(" ")[0]
+                if len(rev) != 0:
+                        return rev
         return "<unknown>"