[OE-core] [PATCH 3/7] combo-layer: ignore patch-* temp directories in dirty check
Paul Eggleton
paul.eggleton at linux.intel.com
Tue Jul 31 00:06:22 UTC 2012
Make the dirty repo check somewhat less strict by ignoring old
patch directories created by this tool.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
scripts/combo-layer | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 554ac06..a93fb9b 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)
--
1.7.9.5
More information about the Openembedded-core
mailing list