summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/combo-layer18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 7457ba2c5d..36123238b9 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -150,15 +150,6 @@ def action_update(conf, args):
150 generate the patch list 150 generate the patch list
151 apply the generated patches 151 apply the generated patches
152 """ 152 """
153 # make sure all repos are clean
154 for name in conf.repos:
155 check_repo_clean(conf.repos[name]['local_repo_dir'])
156 check_repo_clean(os.getcwd())
157
158 import uuid
159 patch_dir = "patch-%s" % uuid.uuid4()
160 os.mkdir(patch_dir)
161
162 repos = [] 153 repos = []
163 if len(args) > 1: 154 if len(args) > 1:
164 for arg in args[1:]: 155 for arg in args[1:]:
@@ -174,6 +165,15 @@ def action_update(conf, args):
174 if not repos: 165 if not repos:
175 repos = conf.repos 166 repos = conf.repos
176 167
168 # make sure all repos are clean
169 for name in repos:
170 check_repo_clean(conf.repos[name]['local_repo_dir'])
171 check_repo_clean(os.getcwd())
172
173 import uuid
174 patch_dir = "patch-%s" % uuid.uuid4()
175 os.mkdir(patch_dir)
176
177 for name in repos: 177 for name in repos:
178 repo = conf.repos[name] 178 repo = conf.repos[name]
179 ldir = repo['local_repo_dir'] 179 ldir = repo['local_repo_dir']