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 #31824 from rallytime/bp-31819

Browse source 
Back-port #31819 to 2015.8
This commit is contained in:
Nicole Thomas 2016-03-13 13:59:32 -06:00
commit 5464be07b1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/nspawn.py
View file

@ -653,7 +653,10 @@ def bootstrap_container(name, dist=None, version=None):
'nspawn.bootstrap: no dist provided, defaulting to \'{0}\''
.format(dist)
)
return globals()['_bootstrap_{0}'.format(dist)](name, version=version)
try:
return globals()['_bootstrap_{0}'.format(dist)](name, version=version)
except KeyError:
raise CommandExecutionError('Unsupported distribution "{0}"'.format(dist))
def _needs_install(name):