diff options
| author | Thierry Carrez <thierry@openstack.org> | 2011-08-09 11:22:32 +0100 |
|---|---|---|
| committer | Thierry Carrez <thierry@openstack.org> | 2011-08-09 11:22:32 +0100 |
| commit | 2a8cff40af58d6d2b2fc3a818816eb2a913cccfb (patch) | |
| tree | f24c9ec227be2483c8b41736131162ffa147ff1c /nova/utils.py | |
| parent | 38756955417e5c2fad7c8848252c5a2334912e02 (diff) | |
| download | nova-2a8cff40af58d6d2b2fc3a818816eb2a913cccfb.tar.gz nova-2a8cff40af58d6d2b2fc3a818816eb2a913cccfb.tar.xz nova-2a8cff40af58d6d2b2fc3a818816eb2a913cccfb.zip | |
Fix ajaxterm's use of shell=True, prevent vmops.py from running its own version of utils.execute
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/nova/utils.py b/nova/utils.py index 0820a2bde..7f27c5fd5 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -138,8 +138,6 @@ def execute(*cmd, **kwargs): :delay_on_retry True | False. Defaults to True. If set to True, wait a short amount of time before retrying. :attempts How many times to retry cmd. - :shell True | False. Defaults to False. If set to True, - Popen command is called shell=True. :run_as_root True | False. Defaults to False. If set to True, the command is prefixed by the command specified in the sudo_helper FLAG. @@ -153,7 +151,6 @@ def execute(*cmd, **kwargs): check_exit_code = kwargs.pop('check_exit_code', 0) delay_on_retry = kwargs.pop('delay_on_retry', True) attempts = kwargs.pop('attempts', 1) - shell = kwargs.pop('shell', False) run_as_root = kwargs.pop('run_as_root', False) if len(kwargs): raise exception.Error(_('Got unknown keyword args ' @@ -175,7 +172,6 @@ def execute(*cmd, **kwargs): stdin=_PIPE, stdout=_PIPE, stderr=_PIPE, - shell=shell, env=env) result = None if process_input is not None: |