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

catch failing import

Browse Source
This commit is contained in:
David Boucha 2014-01-10 16:24:05 -07:00
parent 0cb731809e
commit 7cfb3eada9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/modules/openstack_config.py
View File

@ -15,7 +15,12 @@ import salt.exceptions
from salt.utils.decorators import which as _which
import shlex
import pipes
try:
import pipes
HAS_DEPS = True
except ImportError:
HAS_DEPS = False
if hasattr(shlex, 'quote'):
_quote = shlex.quote
elif hasattr(pipes, 'quote'):
@ -30,7 +35,7 @@ __func_alias__ = {
def __virtual__():
if _quote is None:
if _quote is None and not HAS_DEPS:
return False
return 'openstack_config'