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 #48413 from twangboy/fix_47811

Browse source 
Fix archive.extracted to handle UNC paths
This commit is contained in:
Nicole Thomas 2018-07-03 10:14:45 -04:00 • committed by GitHub
commit d3ba345da5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/states/archive.py
View file

@ -80,6 +80,8 @@ def _checksum_file_path(path):
drive.rstrip(':'),
path.lstrip('/\\'),
)
elif str(exc).startswith('Cannot mix UNC'):
relpath = salt.utils.path_join('unc', path)
else:
raise
ret = salt.utils.path_join(__opts__['cachedir'], 'archive_hash', relpath)