saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bug fix salt/cli/batch.py

Browse source
This commit is contained in:
tanlingyun2005 2019-04-20 03:30:44 +08:00
parent 211915ca90
commit 509c79728c
No known key found for this signature in database
GPG key ID: 8A990538320994B2
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/cli/batch.py
View file

@ -8,6 +8,7 @@ from __future__ import absolute_import, print_function, unicode_literals
import math
import time
import copy
import sys
from datetime import datetime, timedelta
# Import salt libs
@ -85,8 +86,11 @@ class Batch(object):
'''
partition = lambda x: float(x) / 100.0 * len(self.minions)
try:
if (isinstance(self.opts['batch'], str) or isinstance(self.opts['batch'], unicode)) \
and '%' in self.opts['batch']:
if sys.version_info.major == 3:
batch_is_str = isinstance(self.opts['batch'], str)
else:
batch_is_str = isinstance(self.opts['batch'], str) or isinstance(self.opts['batch'], unicode)
if batch_is_str and '%' in self.opts['batch']:
res = partition(float(self.opts['batch'].strip('%')))
if res < 1:
return int(math.ceil(res))