openstack/fuel-qa
Code Issues Proposed changes

Merge "Fix repos list processing flow"

Browse Source
This commit is contained in:
Jenkins 2016-04-06 09:10:34 +00:00 committed by Gerrit Code Review
commit 0d915c85eb
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fuelweb_test/helpers/replace_repos.py
View File

@ -38,9 +38,8 @@ def replace_ubuntu_repos(repos_attr, upstream_host):
if help_data.EXTRA_DEB_REPOS: if help_data.EXTRA_DEB_REPOS:
repos = add_ubuntu_extra_mirrors(repos=repos) repos = add_ubuntu_extra_mirrors(repos=repos)
if help_data.PATCHING_DISABLE_UPDATES: if help_data.PATCHING_DISABLE_UPDATES:
for repo in repos: repos = [repo for repo in repos if repo['name']
if repo['name'] in ('mos-updates', 'mos-security'): not in ('mos-updates', 'mos-security')]
repos.remove(repo)
return repos return repos
@ -66,9 +65,8 @@ def replace_centos_repos(repos_attr, upstream_host):
if help_data.EXTRA_RPM_REPOS: if help_data.EXTRA_RPM_REPOS:
repos = add_centos_extra_mirrors(repos=repos) repos = add_centos_extra_mirrors(repos=repos)
if help_data.PATCHING_DISABLE_UPDATES: if help_data.PATCHING_DISABLE_UPDATES:
for repo in repos: repos = [repo for repo in repos if repo['name']
if repo['name'] in ('mos-updates', 'mos-security'): not in ('mos-updates', 'mos-security')]
repos.remove(repo)
return repos return repos
@ -134,10 +132,10 @@ def add_ubuntu_extra_mirrors(repos=None, prefix='extra',
if repo_value and check_new_ubuntu_repo(repos, repo_value): if repo_value and check_new_ubuntu_repo(repos, repo_value):
# Remove repos that use the same name # Remove repos that use the same name
for repo in repos: repos = [repo for repo in repos
if repo["name"] == repo_value["name"]: if repo["name"] != repo_value["name"]]
repos.remove(repo)
repos.append(repo_value) repos.append(repo_value)
return repos return repos
@ -151,10 +149,10 @@ def add_centos_extra_mirrors(repos=None,
repo_value = parse_centos_repo(repo_str, priority) repo_value = parse_centos_repo(repo_str, priority)
if repo_value and check_new_centos_repo(repos, repo_value): if repo_value and check_new_centos_repo(repos, repo_value):
# Remove repos that use the same name # Remove repos that use the same name
for repo in repos: repos = [repo for repo in repos
if repo["name"] == repo_value["name"]: if repo["name"] != repo_value["name"]]
repos.remove(repo)
repos.append(repo_value) repos.append(repo_value)
return repos return repos