diff options
| author | Matt Riedemann <mriedem@us.ibm.com> | 2014-07-16 02:01:15 -0700 |
|---|---|---|
| committer | Matt Riedemann <mriedem@us.ibm.com> | 2014-07-16 02:06:33 -0700 |
| commit | 51e604f87eadf7f14b37bcc6350900892ece8eca (patch) | |
| tree | 93fff523a49d5a20a14d0b2678cfe76832188a50 /nova/utils.py | |
| parent | 62d4d458d6e048eaeaf2621d8a70969b71c6d235 (diff) | |
| download | nova-51e604f87eadf7f14b37bcc6350900892ece8eca.tar.gz | |
Cleanup and gate on hacking E713 rule
This fixes the offending instances of the rule
and removes it from the ignore list in tox.ini
so that we can gate on the E713 rule.
Change-Id: I1f9ef23a8569252b5b6fa660d0d200b1702056d0
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/utils.py b/nova/utils.py index bf5a522926..823a7a9dec 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -158,14 +158,14 @@ def _get_root_helper(): def execute(*cmd, **kwargs): """Convenience wrapper around oslo's execute() method.""" - if 'run_as_root' in kwargs and not 'root_helper' in kwargs: + if 'run_as_root' in kwargs and 'root_helper' not in kwargs: kwargs['root_helper'] = _get_root_helper() return processutils.execute(*cmd, **kwargs) def trycmd(*args, **kwargs): """Convenience wrapper around oslo's trycmd() method.""" - if 'run_as_root' in kwargs and not 'root_helper' in kwargs: + if 'run_as_root' in kwargs and 'root_helper' not in kwargs: kwargs['root_helper'] = _get_root_helper() return processutils.trycmd(*args, **kwargs) |