From f558ecf90e05e7ba32f1a4a24572c450360244dc Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 31 Jul 2012 01:06:22 +0100 Subject: combo-layer: ignore patch-* temp directories in dirty check Make the dirty repo check somewhat less strict by ignoring old patch directories created by this tool. (From OE-Core rev: fea477ac55e2555c5bb0aad36db641aaa27aa915) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/combo-layer | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts/combo-layer') diff --git a/scripts/combo-layer b/scripts/combo-layer index 554ac06191..a93fb9b0e6 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -25,6 +25,7 @@ import optparse import logging import subprocess import ConfigParser +import re __version__ = "0.2.1" @@ -140,7 +141,9 @@ def check_repo_clean(repodir): exit if repo is dirty """ output=runcmd("git status --porcelain", repodir) - if output: + r = re.compile('\?\? patch-.*/') + dirtyout = [item for item in output.splitlines() if not r.match(item)] + if dirtyout: logger.error("git repo %s is dirty, please fix it first", repodir) sys.exit(1) -- cgit v1.2.3-54-g00ecf