[oe-commits] Paul Eggleton : combo-layer: ignore patch-* temp directories in dirty check

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: fea477ac55e2555c5bb0aad36db641aaa27aa915
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fea477ac55e2555c5bb0aad36db641aaa27aa915

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Tue Jul 31 01:06:22 2012 +0100

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.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/combo-layer |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

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)