made sequence more flexible, can handle descending and negative sequences and is skipped if start==end

This commit is contained in:
Brian Coca 2015-03-27 15:41:02 -04:00 committed by Toshio Kuratomi
parent f18a128f12
commit 54fb04afc4

View file

@ -151,10 +151,17 @@ class LookupModule(object):
) )
elif self.count is not None: elif self.count is not None:
# convert count to end # convert count to end
self.end = self.start + self.count * self.stride - 1 if self.count != 0:
self.end = self.start + self.count * self.stride - 1
else:
self.start = 0
self.end = 0
self.stride = 0
del self.count del self.count
if self.end < self.start: if self.stride > 0 and self.end < self.start:
raise AnsibleError("can't count backwards") raise AnsibleError("to count backwards make stride negative")
if self.stride < 0 and self.end > self.start:
raise AnsibleError("to count forward don't make stride negative")
if self.format.count('%') != 1: if self.format.count('%') != 1:
raise AnsibleError("bad formatting string: %s" % self.format) raise AnsibleError("bad formatting string: %s" % self.format)
@ -197,12 +204,13 @@ class LookupModule(object):
self.sanity_check() self.sanity_check()
results.extend(self.generate_sequence()) if self.start != self.end:
results.extend(self.generate_sequence())
except AnsibleError: except AnsibleError:
raise raise
except Exception: except Exception, e:
raise AnsibleError( raise AnsibleError(
"unknown error generating sequence" "unknown error generating sequence: %s" % str(e)
) )
return results return results