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

Merge pull request #51407 from aplanas/backport_49803

Browse source 
parted: fix _validate_partition_boundary
This commit is contained in:
Daniel Wozniak 2019-01-30 13:05:01 -07:00 • committed by GitHub
commit 756c367c6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
salt/modules/parted.py
View file

@ -19,6 +19,7 @@ from __future__ import absolute_import, unicode_literals, print_function
# Import python libs
import os
import re
import stat
import string
import logging
@ -91,15 +92,15 @@ def _validate_partition_boundary(boundary):
'''
Ensure valid partition boundaries are supplied.
'''
try:
for unit in VALID_UNITS:
if six.text_type(boundary).endswith(unit):
return
int(boundary)
except Exception:
raise CommandExecutionError(
'Invalid partition boundary passed: "{0}"'.format(boundary)
)
boundary = six.text_type(boundary)
match = re.search(r'^([\d.]+)(\D*)$', boundary)
if match:
unit = match.group(2)
if not unit or unit in VALID_UNITS:
return
raise CommandExecutionError(
'Invalid partition boundary passed: "{0}"'.format(boundary)
)
def probe(*devices):