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

Fix deprecated exception handling

Browse source 
Use 'path is on' to account for instances where the message is 'path is
on mount' vs 'path is on drive', both of which will throw this error.
This commit is contained in:
twangboy 2018-05-25 12:13:53 -06:00
parent 8dd6710b93
commit 365f81651b
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/states/archive.py
View file

@ -73,7 +73,7 @@ def _checksum_file_path(path):
)
except ValueError as exc:
# The path is on a different drive (Windows)
if 'path is on drive' in exc.message:
if str(exc).startswith('path is on'):
drive, path = os.path.splitdrive(path)
relpath = salt.utils.path_join(
'local',