[OE-core] [PATCH 5/7] scripts/combo-layer: fix dirty repo check
Paul Eggleton
paul.eggleton at linux.intel.com
Fri Nov 4 17:55:38 UTC 2011
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)
--
1.7.5.4
More information about the Openembedded-core
mailing list