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 #26972 from twangboy/fix_20522

Browse source 
Catch the 404 error from fileclient
This commit is contained in:
Justin Findlay 2015-09-10 14:53:12 -06:00
commit e8cdcc62f7
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/win_pkg.py
View file

@ -28,6 +28,7 @@ from distutils.version import LooseVersion # pylint: disable=E0611
# Import salt libs
import salt.utils
from salt.exceptions import MinionError
log = logging.getLogger(__name__)
@ -465,7 +466,10 @@ def install(name=None, refresh=False, pkgs=None, saltenv='base', **kwargs):
cached_pkg = __salt__['cp.is_cached'](installer, saltenv)
if not cached_pkg:
# It's not cached. Cache it, mate.
cached_pkg = __salt__['cp.cache_file'](installer, saltenv)
try:
cached_pkg = __salt__['cp.cache_file'](installer, saltenv)
except MinionError as exc:
return '{0}: {1}'.format(exc, installer)
if not cached_pkg:
return 'Unable to cache file {0} from saltenv: {1}'\
.format(installer, saltenv)