[oe-commits] [openembedded-core] 15/50: image-buildinfo: treat staged changes as modified branch, too

[git at git.openembedded.org]

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

commit b46906889665f6ab72bccee608276646cda50140
Author: André Draszik <adraszik at tycoint.com>
AuthorDate: Fri Nov 4 10:53:33 2016 +0000

    image-buildinfo: treat staged changes as modified branch, too
    
    When staging changes in a layer using git add, image-buildinfo
    doesn't detect this as a modification, because of the way it
    uses git diff.
    
    Surely, merely staging, but not committing changes to git
    should not result in image-buildhistory assuming that the
    git repository hasn't been modified compared to the branch
    HEAD, this state should be treated similarly to modifications
    being unstaged.
    
    We have to use both, git diff and git diff --cached to get the
    desired result.
    
    Signed-off-by: André Draszik <adraszik at tycoint.com>
    Reported-by: Lukasz Nowak <lnowak at tycoint.com>
    Reviewed-by: Lukasz Nowak <lnowak at tycoint.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/image-buildinfo.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/image-buildinfo.bbclass b/meta/classes/image-buildinfo.bbclass
index 3003f5d..da1edf7 100644
--- a/meta/classes/image-buildinfo.bbclass
+++ b/meta/classes/image-buildinfo.bbclass
@@ -28,7 +28,9 @@ def image_buildinfo_outputvars(vars, listvars, d):
 def get_layer_git_status(path):
     import subprocess
     try:
-        subprocess.check_output("cd %s; PSEUDO_UNLOAD=1 git diff --quiet --no-ext-diff" % path,
+        subprocess.check_output("""cd %s; export PSEUDO_UNLOAD=1; set -e;
+                                git diff --quiet --no-ext-diff
+                                git diff --quiet --no-ext-diff --cached""" % path,
                                 shell=True,
                                 stderr=subprocess.STDOUT)
         return ""

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