diff options
| author | Ricardo Carrillo Cruz <emaildericky@gmail.com> | 2011-01-25 15:33:19 +0100 |
|---|---|---|
| committer | Ricardo Carrillo Cruz <emaildericky@gmail.com> | 2011-01-25 15:33:19 +0100 |
| commit | 3ad22216eee67abfabb28efe2561f0fdcf10e6e1 (patch) | |
| tree | f4288525d1ec55edfcd48dbb83cb913af95a001b /nova/utils.py | |
| parent | 34d1022e8fbcfe2b6aaf30c6916ad01f0fe1769c (diff) | |
| parent | 07f39806f3b82d5d06371758e3efe597a47434ed (diff) | |
| download | nova-3ad22216eee67abfabb28efe2561f0fdcf10e6e1.tar.gz nova-3ad22216eee67abfabb28efe2561f0fdcf10e6e1.tar.xz nova-3ad22216eee67abfabb28efe2561f0fdcf10e6e1.zip | |
Fixed merge conflict
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::' |