role.py (ansible-2.14.0) | : | role.py (ansible-2.14.1rc1) | ||
---|---|---|---|---|
skipping to change at line 36 | skipping to change at line 36 | |||
import datetime | import datetime | |||
import os | import os | |||
import tarfile | import tarfile | |||
import tempfile | import tempfile | |||
from collections.abc import MutableSequence | from collections.abc import MutableSequence | |||
from shutil import rmtree | from shutil import rmtree | |||
from ansible import context | from ansible import context | |||
from ansible.errors import AnsibleError, AnsibleParserError | from ansible.errors import AnsibleError, AnsibleParserError | |||
from ansible.galaxy.api import GalaxyAPI | ||||
from ansible.galaxy.user_agent import user_agent | from ansible.galaxy.user_agent import user_agent | |||
from ansible.module_utils._text import to_native, to_text | from ansible.module_utils._text import to_native, to_text | |||
from ansible.module_utils.common.yaml import yaml_dump, yaml_load | from ansible.module_utils.common.yaml import yaml_dump, yaml_load | |||
from ansible.module_utils.compat.version import LooseVersion | from ansible.module_utils.compat.version import LooseVersion | |||
from ansible.module_utils.urls import open_url | from ansible.module_utils.urls import open_url | |||
from ansible.playbook.role.requirement import RoleRequirement | from ansible.playbook.role.requirement import RoleRequirement | |||
from ansible.utils.display import Display | from ansible.utils.display import Display | |||
display = Display() | display = Display() | |||
skipping to change at line 65 | skipping to change at line 66 | |||
self._metadata = None | self._metadata = None | |||
self._metadata_dependencies = None | self._metadata_dependencies = None | |||
self._requirements = None | self._requirements = None | |||
self._install_info = None | self._install_info = None | |||
self._validate_certs = not context.CLIARGS['ignore_certs'] | self._validate_certs = not context.CLIARGS['ignore_certs'] | |||
display.debug('Validate TLS certificates: %s' % self._validate_certs) | display.debug('Validate TLS certificates: %s' % self._validate_certs) | |||
self.galaxy = galaxy | self.galaxy = galaxy | |||
self.api = api | self._api = api | |||
self.name = name | self.name = name | |||
self.version = version | self.version = version | |||
self.src = src or name | self.src = src or name | |||
self.download_url = None | self.download_url = None | |||
self.scm = scm | self.scm = scm | |||
self.paths = [os.path.join(x, self.name) for x in galaxy.roles_paths] | self.paths = [os.path.join(x, self.name) for x in galaxy.roles_paths] | |||
if path is not None: | if path is not None: | |||
if not path.endswith(os.path.join(os.path.sep, self.name)): | if not path.endswith(os.path.join(os.path.sep, self.name)): | |||
skipping to change at line 106 | skipping to change at line 107 | |||
""" | """ | |||
if self.version: | if self.version: | |||
return "%s (%s)" % (self.name, self.version) | return "%s (%s)" % (self.name, self.version) | |||
else: | else: | |||
return self.name | return self.name | |||
def __eq__(self, other): | def __eq__(self, other): | |||
return self.name == other.name | return self.name == other.name | |||
@property | @property | |||
def api(self): | ||||
if not isinstance(self._api, GalaxyAPI): | ||||
return self._api.api | ||||
return self._api | ||||
@property | ||||
def metadata(self): | def metadata(self): | |||
""" | """ | |||
Returns role metadata | Returns role metadata | |||
""" | """ | |||
if self._metadata is None: | if self._metadata is None: | |||
for path in self.paths: | for path in self.paths: | |||
for meta_main in self.META_MAIN: | for meta_main in self.META_MAIN: | |||
meta_path = os.path.join(path, meta_main) | meta_path = os.path.join(path, meta_main) | |||
if os.path.isfile(meta_path): | if os.path.isfile(meta_path): | |||
try: | try: | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 8 lines changed or added |