summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-11-02 17:20:26 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-07 14:05:36 (GMT)
commit948d28e80101f26715b67dea169dbbd81dd37f91 (patch)
treecdc2ad9b4df0943c02ae8c554bd6db3d36bf3df7 /scripts/combo-layer
parent25fc202e213e844334c680a35d7068c202e05aba (diff)
downloadpoky-948d28e80101f26715b67dea169dbbd81dd37f91.tar.gz
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>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer8
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):
138 check if the repo is clean 138 check if the repo is clean
139 exit if repo is dirty 139 exit if repo is dirty
140 """ 140 """
141 try: 141 output=runcmd("git status --porcelain", repodir)
142 runcmd("git diff --quiet", repodir) 142 if output:
143 #TODO: also check the index using "git diff --cached"
144 # but this will fail in just initialized git repo
145 # so need figure out a way
146 except:
147 logger.error("git repo %s is dirty, please fix it first", repodir) 143 logger.error("git repo %s is dirty, please fix it first", repodir)
148 sys.exit(1) 144 sys.exit(1)
149 145