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>
This commit is contained in:
parent
2ed3f63b02
commit
f558ecf90e
|
@ -25,6 +25,7 @@ import optparse
|
||||||
import logging
|
import logging
|
||||||
import subprocess
|
import subprocess
|
||||||
import ConfigParser
|
import ConfigParser
|
||||||
|
import re
|
||||||
|
|
||||||
__version__ = "0.2.1"
|
__version__ = "0.2.1"
|
||||||
|
|
||||||
|
@ -140,7 +141,9 @@ def check_repo_clean(repodir):
|
||||||
exit if repo is dirty
|
exit if repo is dirty
|
||||||
"""
|
"""
|
||||||
output=runcmd("git status --porcelain", repodir)
|
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)
|
logger.error("git repo %s is dirty, please fix it first", repodir)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue