From b20d54520c1b635409057f7c73ffddab7bc9b07b Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Wed, 15 Apr 2015 01:06:02 -0400 Subject: [PATCH] Fix errors reporting for playbook/* --- v2/ansible/playbook/become.py | 6 +++--- v2/ansible/playbook/playbook_include.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/v2/ansible/playbook/become.py b/v2/ansible/playbook/become.py index 291cff2b716..272976929a7 100644 --- a/v2/ansible/playbook/become.py +++ b/v2/ansible/playbook/become.py @@ -45,11 +45,11 @@ class Become: if has_become: msg = 'The become params ("become", "become_user") and' if has_sudo: - raise errors.AnsibleParserError('%s sudo params ("sudo", "sudo_user") cannot be used together' % msg) + raise AnsibleParserError('%s sudo params ("sudo", "sudo_user") cannot be used together' % msg) elif has_su: - raise errors.AnsibleParserError('%s su params ("su", "su_user") cannot be used together' % msg) + raise AnsibleParserError('%s su params ("su", "su_user") cannot be used together' % msg) elif has_sudo and has_su: - raise errors.AnsibleParserError('sudo params ("sudo", "sudo_user") and su params ("su", "su_user") cannot be used together') + raise AnsibleParserError('sudo params ("sudo", "sudo_user") and su params ("su", "su_user") cannot be used together') def _preprocess_data_become(self, ds): """Preprocess the playbook data for become attributes diff --git a/v2/ansible/playbook/playbook_include.py b/v2/ansible/playbook/playbook_include.py index 2e4964fce96..5c91dd14adb 100644 --- a/v2/ansible/playbook/playbook_include.py +++ b/v2/ansible/playbook/playbook_include.py @@ -27,6 +27,7 @@ from ansible.playbook.attribute import FieldAttribute from ansible.playbook.base import Base from ansible.playbook.conditional import Conditional from ansible.playbook.taggable import Taggable +from ansible.errors import AnsibleParserError class PlaybookInclude(Base):