summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-01-07 18:00:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:51 +0000
commit62d94a44ae85055b9812aad694f55d483bf0e642 (patch)
tree219f03f4dd21627114373efbc4ffdb93b76491a1 /scripts/combo-layer
parentf51e79b0004d9d383d93444d74128c5ec1193225 (diff)
downloadast2050-yocto-poky-62d94a44ae85055b9812aad694f55d483bf0e642.zip
ast2050-yocto-poky-62d94a44ae85055b9812aad694f55d483bf0e642.tar.gz
combo-layer: minor refactor
Change get_repos() to assume a list of repository names instead of full list of command line arguments. (From OE-Core rev: d2d8f3c2a7570bb74db713ddc83059d3b3bd4b2e) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer25
1 files changed, 12 insertions, 13 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 19d64e6..37d1f47 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -305,18 +305,17 @@ def check_rev_branch(component, repodir, rev, branch):
return False
return True
-def get_repos(conf, args):
+def get_repos(conf, repo_names):
repos = []
- if len(args) > 1:
- for arg in args[1:]:
- if arg.startswith('-'):
- break
- else:
- repos.append(arg)
- for repo in repos:
- if not repo in conf.repos:
- logger.error("Specified component '%s' not found in configuration" % repo)
- sys.exit(0)
+ for name in repo_names:
+ if name.startswith('-'):
+ break
+ else:
+ repos.append(name)
+ for repo in repos:
+ if not repo in conf.repos:
+ logger.error("Specified component '%s' not found in configuration" % repo)
+ sys.exit(0)
if not repos:
repos = conf.repos
@@ -327,7 +326,7 @@ def action_pull(conf, args):
"""
update the component repos only
"""
- repos = get_repos(conf, args)
+ repos = get_repos(conf, args[1:])
# make sure all repos are clean
for name in repos:
@@ -348,7 +347,7 @@ def action_update(conf, args):
generate the patch list
apply the generated patches
"""
- repos = get_repos(conf, args)
+ repos = get_repos(conf, args[1:])
# make sure combo repo is clean
check_repo_clean(os.getcwd())
OpenPOWER on IntegriCloud