From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Wed, 2 Nov 2011 17:20:26 +0000 (+0000)
Subject: scripts/combo-layer: fix dirty repo check
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=948d28e80101f26715b67dea169dbbd81dd37f91;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

scripts/combo-layer: fix dirty repo check

Fix the dirty repository check to detect any changes, including
untracked files and uncommitted changes in the index.

(From OE-Core rev: f03fa8bbafa82ce6b09c08bf86011b6c51eb3531)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 4cb9ee072bc..f3480dcf5ab 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -138,12 +138,8 @@ def check_repo_clean(repodir):
         check if the repo is clean
         exit if repo is dirty
     """
-    try:
-        runcmd("git diff --quiet", repodir)
-        #TODO: also check the index using "git diff --cached"
-        #      but this will fail in just initialized git repo
-        #      so need figure out a way
-    except:
+    output=runcmd("git status --porcelain", repodir)
+    if output:
         logger.error("git repo %s is dirty, please fix it first", repodir)
         sys.exit(1)