summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-07-31 00:06:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-31 07:02:10 (GMT)
commitf558ecf90e05e7ba32f1a4a24572c450360244dc (patch)
tree898f29ec0f3c5725720d5fc75232b49e89cece4a /scripts/combo-layer
parent2ed3f63b021626fa3de90153c5648ad927518e21 (diff)
downloadpoky-f558ecf90e05e7ba32f1a4a24572c450360244dc.tar.gz
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 <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer5
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
25import logging 25import logging
26import subprocess 26import subprocess
27import ConfigParser 27import ConfigParser
28import re
28 29
29__version__ = "0.2.1" 30__version__ = "0.2.1"
30 31
@@ -140,7 +141,9 @@ def check_repo_clean(repodir):
140 exit if repo is dirty 141 exit if repo is dirty
141 """ 142 """
142 output=runcmd("git status --porcelain", repodir) 143 output=runcmd("git status --porcelain", repodir)
143 if output: 144 r = re.compile('\?\? patch-.*/')
145 dirtyout = [item for item in output.splitlines() if not r.match(item)]
146 if dirtyout:
144 logger.error("git repo %s is dirty, please fix it first", repodir) 147 logger.error("git repo %s is dirty, please fix it first", repodir)
145 sys.exit(1) 148 sys.exit(1)
146 149