[OE-core] [PATCH v2 1/2] combo-layer: minor refactor
Markus Lehtonen
markus.lehtonen at linux.intel.com
Wed Jan 7 16:00:41 UTC 2015
Change get_repos() to assume a list of repository names instead of full
list of command line arguments.
Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>
---
scripts/combo-layer | 25 ++++++++++++-------------
1 file 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())
--
1.8.4.5
More information about the Openembedded-core
mailing list