This commit is contained in:
Veres Lajos
2014-12-04 22:23:35 +00:00
parent ae17b993d9
commit bf5d8ee678
24 changed files with 31 additions and 31 deletions

View File

@@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
'''
Compat library for ansible. This contains compatiblity definitions for older python
Compat library for ansible. This contains compatibility definitions for older python
When we need to import a module differently depending on python version, do it
here. Then in the code we can simply import from compat in order to get what we want.
'''

View File

@@ -61,7 +61,7 @@ class AnsibleError(Exception):
def _get_error_lines_from_file(self, file_name, line_number):
'''
Returns the line in the file which coresponds to the reported error
location, as well as the line preceeding it (if the error did not
location, as well as the line preceding it (if the error did not
occur on the first line), to provide context to the error.
'''
@@ -82,7 +82,7 @@ class AnsibleError(Exception):
Given an object reporting the location of the exception in a file, return
detailed information regarding it including:
* the line which caused the error as well as the one preceeding it
* the line which caused the error as well as the one preceding it
* causes and suggested remedies for common syntax errors
If this error was created with show_content=False, the reporting of content

View File

@@ -130,12 +130,12 @@ class DataLoader():
show_content = False
return (data, show_content)
except (IOError, OSError) as e:
raise AnsibleParserError("an error occured while trying to read the file '%s': %s" % (file_name, str(e)))
raise AnsibleParserError("an error occurred while trying to read the file '%s': %s" % (file_name, str(e)))
def _handle_error(self, yaml_exc, file_name, show_content):
'''
Optionally constructs an object (AnsibleBaseYAMLObject) to encapsulate the
file name/position where a YAML exception occured, and raises an AnsibleParserError
file name/position where a YAML exception occurred, and raises an AnsibleParserError
to display the syntax exception information.
'''

View File

@@ -170,7 +170,7 @@ class Play(Base):
if len(self.roles) > 0:
for ri in self.roles:
# The internal list of roles are actualy RoleInclude objects,
# The internal list of roles are actually RoleInclude objects,
# so we load the role from that now
role = Role.load(ri)