cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Do not import all ansible errors and fix the exception raised

Browse source
This commit is contained in:
Michael Scherer 2015-04-14 15:43:02 -04:00
parent 0345b675f8
commit 6957d66a26
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
v2/ansible/inventory/dir.py
View file

@ -23,7 +23,7 @@ __metaclass__ = type
import os
from ansible import constants as C
from ansible.errors import *
from ansible.errors import AnsibleError
from ansible.inventory.host import Host
from ansible.inventory.group import Group
@ -160,7 +160,7 @@ class InventoryDirectory(object):
# name
if group.name != newgroup.name:
raise errors.AnsibleError("Cannot merge group %s with %s" % (group.name, newgroup.name))
raise AnsibleError("Cannot merge group %s with %s" % (group.name, newgroup.name))
# depth
group.depth = max([group.depth, newgroup.depth])
@ -210,7 +210,7 @@ class InventoryDirectory(object):
# name
if host.name != newhost.name:
raise errors.AnsibleError("Cannot merge host %s with %s" % (host.name, newhost.name))
raise AnsibleError("Cannot merge host %s with %s" % (host.name, newhost.name))
# group membership relation
for newgroup in newhost.groups: