diff options
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-x | scripts/combo-layer | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 4cb9ee072b..f3480dcf5a 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
@@ -138,12 +138,8 @@ def check_repo_clean(repodir): | |||
138 | check if the repo is clean | 138 | check if the repo is clean |
139 | exit if repo is dirty | 139 | exit if repo is dirty |
140 | """ | 140 | """ |
141 | try: | 141 | output=runcmd("git status --porcelain", repodir) |
142 | runcmd("git diff --quiet", repodir) | 142 | if output: |
143 | #TODO: also check the index using "git diff --cached" | ||
144 | # but this will fail in just initialized git repo | ||
145 | # so need figure out a way | ||
146 | except: | ||
147 | logger.error("git repo %s is dirty, please fix it first", repodir) | 143 | logger.error("git repo %s is dirty, please fix it first", repodir) |
148 | sys.exit(1) | 144 | sys.exit(1) |
149 | 145 | ||