summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2017-02-20 12:34:30 -0500
committerGitHub <noreply@github.com>2017-02-20 12:34:30 -0500
commitbc26f6b0fc90d4501161e16dcf68130d03ca06a7 (patch)
treea5113c1cb59ee2eab3eabde01aed46501a7f34b3
parent9492616511632c26bf42f786c6fba5f40f15d4d9 (diff)
parent0d6535242db07968206b3af15046f62a30748449 (diff)
downloadopenshift-bc26f6b0fc90d4501161e16dcf68130d03ca06a7.tar.gz
openshift-bc26f6b0fc90d4501161e16dcf68130d03ca06a7.tar.bz2
openshift-bc26f6b0fc90d4501161e16dcf68130d03ca06a7.tar.xz
openshift-bc26f6b0fc90d4501161e16dcf68130d03ca06a7.zip
Merge pull request #3426 from rhcarvalho/fix-code-gen-validation
Fix validation of generated code
-rw-r--r--roles/lib_utils/src/class/repoquery.py2
-rw-r--r--setup.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/roles/lib_utils/src/class/repoquery.py b/roles/lib_utils/src/class/repoquery.py
index 2447719e2..82adcada5 100644
--- a/roles/lib_utils/src/class/repoquery.py
+++ b/roles/lib_utils/src/class/repoquery.py
@@ -60,7 +60,7 @@ class Repoquery(RepoqueryCLI):
''' Gather and present the versions of each package '''
versions_dict = {}
- versions_dict['available_versions_full'] = formatted_versions.keys()
+ versions_dict['available_versions_full'] = list(formatted_versions.keys())
# set the match version, if called
if self.match_version:
diff --git a/setup.py b/setup.py
index 372aca9ff..2ad26110b 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@ import yaml
from setuptools import setup, Command
from setuptools_lint.setuptools_command import PylintCommand
from six import string_types
+from six.moves import reload_module
from yamllint.config import YamlLintConfig
from yamllint.cli import Format
from yamllint import linter
@@ -185,6 +186,7 @@ class OpenShiftAnsibleGenerateValidation(Command):
# the python path.
# pylint: disable=import-error
import generate
+ reload_module(generate)
generate.verify()
except generate.GenerateAnsibleException as gae:
print(gae.args)