[oe-commits] Paul Eggleton : scripts/combo-layer: fix dirty repo check

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: f03fa8bbafa82ce6b09c08bf86011b6c51eb3531
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f03fa8bbafa82ce6b09c08bf86011b6c51eb3531

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Wed Nov  2 17:20:26 2011 +0000

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.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 scripts/combo-layer |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 4cb9ee0..f3480dc 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)