x/cloud-init
Code Issues Proposed changes

Readd the original prefix to the netinfo (if provided).

Browse Source
This commit is contained in:
Joshua Harlow 2012-06-29 12:28:44 -07:00
parent 4d6bcf81d4
commit afc62cf910
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cloudinit/netinfo.py
View File

@ -150,8 +150,18 @@ def route_pformat():
return "\n".join(lines) return "\n".join(lines)
def debug_info(): def debug_info(prefix='ci-info: '):
lines = [] lines = []
lines.append(netdev_pformat()) netdev_lines = netdev_pformat().splitlines()
lines.append(route_pformat()) if prefix:
for line in netdev_lines:
lines.append("%s%s" % (prefix, line))
else:
lines.extend(netdev_lines)
route_lines = route_pformat().splitlines()
if prefix:
for line in route_lines:
lines.append("%s%s" % (prefix, line))
else:
lines.extend(route_lines)
return "\n".join(lines) return "\n".join(lines)