summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-22 17:15:04 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-23 12:13:08 (GMT)
commitfd3f7d5d6a6fd0c08f34e9eecfed6f9689e44e85 (patch)
tree01ea9f25b5ebcb1a83b000bac6629e4d883bfe31 /scripts/combo-layer
parent6a44fcb236072ee9b520894193bdf5fbb06cad44 (diff)
downloadpoky-fd3f7d5d6a6fd0c08f34e9eecfed6f9689e44e85.tar.gz
scripts/combo-layer: limit component repo dirty check
If one or more components are specified for update, only check if their repository/repositories are dirty rather than checking all of the configured repositories. (From OE-Core rev: b03e710c88ad0c66cf731647f26e8441d0074cae) 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-xscripts/combo-layer18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 7457ba2..3612323 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']