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

modules.lxc: str -> basestr

Browse Source
This commit is contained in:
Matthew Williams 2014-07-15 16:34:29 +00:00
parent 1245cb449a
commit 81aaf6715e
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/lxc.py
View File

@ -2080,7 +2080,7 @@ def run_cmd(name, cmd, no_start=False, preserve_state=True,
if not prior_state:
return prior_state
if attachable(name):
if isinstance(keep_env, str):
if isinstance(keep_env, basestring):
keep_env = keep_env.split(',')
if keep_env:
env = ' '.join('{0}=${0}'.format(x) for x in keep_env)