[oe-commits] [openembedded-core] 14/50: classes/buildhistory: use BB_CMDLINE to get bitbake command line

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit fbedf572bd83ee97c26f078471615022c347f518
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Fri Jun 9 15:50:40 2017 +0200

    classes/buildhistory: use BB_CMDLINE to get bitbake command line
    
    We put the bitbake command line in the buildhistory commit message for
    informational purposes, but calling sys.argv to get that as we were
    previously doesn't really work in memory resident mode - that gives you
    the command used to start the bitbake server which is much less
    interesting. Use the just-introduced BB_CMDLINE variable instead.
    
    Part of the fix for [YOCTO #11634].
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/buildhistory.bbclass | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 3e907fc..74b837e 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -696,11 +696,14 @@ def buildhistory_get_sdkvars(d):
 
 
 def buildhistory_get_cmdline(d):
-    if sys.argv[0].endswith('bin/bitbake'):
-        bincmd = 'bitbake'
-    else:
-        bincmd = sys.argv[0]
-    return '%s %s' % (bincmd, ' '.join(sys.argv[1:]))
+    argv = d.getVar('BB_CMDLINE', False)
+    if argv:
+        if argv[0].endswith('bin/bitbake'):
+            bincmd = 'bitbake'
+        else:
+            bincmd = argv[0]
+        return '%s %s' % (bincmd, ' '.join(argv[1:]))
+    return ''
 
 
 buildhistory_single_commit() {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.