From patchwork Fri Nov 4 17:55:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [5/7] scripts/combo-layer: fix dirty repo check Date: Fri, 04 Nov 2011 17:55:38 -0000 From: Paul Eggleton X-Patchwork-Id: 14295 Message-Id: <3dd638cdc46847b64d4397ffd5b0fa1190f0b2c8.1320429268.git.paul.eggleton@linux.intel.com> To: openembedded-core@lists.openembedded.org Fix the dirty repository check to detect any changes, including untracked files and uncommitted changes in the index. Signed-off-by: Paul Eggleton --- 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)