summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/combo-layer5
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
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