diff options
| author | Ryan Lane <rlane@wikimedia.org> | 2011-01-25 20:50:14 +0000 |
|---|---|---|
| committer | Ryan Lane <rlane@wikimedia.org> | 2011-01-25 20:50:14 +0000 |
| commit | fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d (patch) | |
| tree | 9e4c224d36a054136d3a7ec18d0f66da52e05551 /nova/utils.py | |
| parent | 2e6a5713d86b487c0b26a72b111531781745aeb2 (diff) | |
| parent | b2d0a77c53d1bd108d233e58f68655381cec4e16 (diff) | |
| download | nova-fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d.tar.gz nova-fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d.tar.xz nova-fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d.zip | |
Merge from trunk
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nova/utils.py b/nova/utils.py index 6d3ddd092..2f3bd2894 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -138,7 +138,7 @@ def execute(cmd, process_input=None, addl_env=None, check_exit_code=True): result = obj.communicate() obj.stdin.close() if obj.returncode: - LOG.debug(_("Result was %s") % (obj.returncode)) + LOG.debug(_("Result was %s") % obj.returncode) if check_exit_code and obj.returncode != 0: (stdout, stderr) = result raise ProcessExecutionError(exit_code=obj.returncode, @@ -214,9 +214,11 @@ def get_my_linklocal(interface): else: return 'fe00::' except IndexError as ex: - LOG.warn(_("Couldn't get Link Local IP of %s :%s"), interface, ex) + LOG.warn(_("Couldn't get Link Local IP of %(interface)s :%(ex)s") + % locals()) except ProcessExecutionError as ex: - LOG.warn(_("Couldn't get Link Local IP of %s :%s"), interface, ex) + LOG.warn(_("Couldn't get Link Local IP of %(interface)s :%(ex)s") + % locals()) except: return 'fe00::' |