diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-07-31 01:06:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-31 08:02:10 +0100 |
commit | f558ecf90e05e7ba32f1a4a24572c450360244dc (patch) | |
tree | 898f29ec0f3c5725720d5fc75232b49e89cece4a /scripts/combo-layer | |
parent | 2ed3f63b021626fa3de90153c5648ad927518e21 (diff) | |
download | openembedded-core-contrib-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-x | scripts/combo-layer | 5 |
1 files changed, 4 insertions, 1 deletions
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) |