valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24898 from rallytime/bp-24845

Browse Source 
Back-port #24845 to 2015.5
This commit is contained in:
Justin Findlay 2015-06-24 09:06:09 -06:00
commit d4dd8d288d
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/modules/dockerio.py
View File

@ -1852,7 +1852,7 @@ def load(imagepath):
if os.path.isfile(imagepath): if os.path.isfile(imagepath):
try: try:
dockercmd = ['docker', 'load', '-i', imagepath] dockercmd = ['docker', 'load', '-i', imagepath]
ret = __salt__['cmd.run'](dockercmd) ret = __salt__['cmd.run'](dockercmd, python_shell=False)
if ((isinstance(ret, dict) and if ((isinstance(ret, dict) and
('retcode' in ret) and ('retcode' in ret) and
(ret['retcode'] != 0))): (ret['retcode'] != 0))):