mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
use AnsibleError so that if there is an error it does not print a traceback
This commit is contained in:
parent
8fa4dc3920
commit
82cca242e3
1 changed files with 5 additions and 3 deletions
|
@ -31,6 +31,8 @@ Note that when beg is specified with left zero padding, then the length of
|
||||||
end must be the same as that of beg, else a exception is raised.
|
end must be the same as that of beg, else a exception is raised.
|
||||||
'''
|
'''
|
||||||
|
|
||||||
|
from ansible import errors
|
||||||
|
|
||||||
def detect_range(line = None):
|
def detect_range(line = None):
|
||||||
'''
|
'''
|
||||||
A helper function that checks a given host line to see if it contains
|
A helper function that checks a given host line to see if it contains
|
||||||
|
@ -70,19 +72,19 @@ def expand_hostname_range(line = None):
|
||||||
(head, nrange, tail) = line.replace('[','|').replace(']','|').split('|')
|
(head, nrange, tail) = line.replace('[','|').replace(']','|').split('|')
|
||||||
bounds = nrange.split(":")
|
bounds = nrange.split(":")
|
||||||
if len(bounds) != 2:
|
if len(bounds) != 2:
|
||||||
raise ValueError("host range incorrectly specified")
|
raise errors.AnsibleError("host range incorrectly specified")
|
||||||
beg = bounds[0]
|
beg = bounds[0]
|
||||||
end = bounds[1]
|
end = bounds[1]
|
||||||
if not beg:
|
if not beg:
|
||||||
beg = "0"
|
beg = "0"
|
||||||
if not end:
|
if not end:
|
||||||
raise ValueError("host range end value missing")
|
raise errors.AnsibleError("host range end value missing")
|
||||||
if beg[0] == '0' and len(beg) > 1:
|
if beg[0] == '0' and len(beg) > 1:
|
||||||
rlen = len(beg) # range length formatting hint
|
rlen = len(beg) # range length formatting hint
|
||||||
else:
|
else:
|
||||||
rlen = None
|
rlen = None
|
||||||
if rlen > 1 and rlen != len(end):
|
if rlen > 1 and rlen != len(end):
|
||||||
raise ValueError("host range format incorrectly specified!")
|
raise errors.AnsibleError("host range format incorrectly specified!")
|
||||||
|
|
||||||
for _ in range(int(beg), int(end)+1):
|
for _ in range(int(beg), int(end)+1):
|
||||||
if rlen:
|
if rlen:
|
||||||
|
|
Loading…
Reference in a new issue