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

Using salt method to identify MS Windows, single instead of double quotes

Browse source
This commit is contained in:
Jochen Breuer 2017-09-07 15:47:13 +02:00
parent 20619b24c4
commit 0c71da95f6
No known key found for this signature in database
GPG key ID: 29ACE79F4D5EEE69
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/modules/kubernetes.py
View file

@ -87,7 +87,7 @@ class TimeoutException(Exception):
pass
if not platform.startswith("win"):
if salt.utils.is_windows():
@contextmanager
def _time_limit(seconds):
def signal_handler(signum, frame):
@ -717,7 +717,7 @@ def delete_deployment(name, namespace='default', **kwargs):
namespace=namespace,
body=body)
mutable_api_response = api_response.to_dict()
if not platform.startswith("win"):
if salt.utils.is_windows():
try:
with _time_limit(POLLING_TIME_LIMIT):
while show_deployment(name, namespace) is not None:
@ -736,9 +736,9 @@ def delete_deployment(name, namespace='default', **kwargs):
else:
sleep(1)
if mutable_api_response['code'] != 200:
log.warning("Reached polling time limit. Deployment is not yet "
"deleted, but we are backing off. Sorry, but you'll "
"have to check manually.")
log.warning('Reached polling time limit. Deployment is not yet '
'deleted, but we are backing off. Sorry, but you\'ll '
'have to check manually.')
return mutable_api_response
except (ApiException, HTTPError) as exc:
if isinstance(exc, ApiException) and exc.status == 404: