summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-06-16 08:54:52 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-06-16 08:54:52 -0700
commitb6421a971006288e6c2edc0cf6771c8fef57a66d (patch)
tree692358a9d68931f0c8ef0508f55d2dc131694cd2 /cloudinit
parentf0c2776f4e48c6f88958c8ec0d5c8f72ab33cd3a (diff)
downloadvyos-cloud-init-b6421a971006288e6c2edc0cf6771c8fef57a66d.tar.gz
vyos-cloud-init-b6421a971006288e6c2edc0cf6771c8fef57a66d.zip
For now just stick to using newline joining.
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/netinfo.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/netinfo.py b/cloudinit/netinfo.py
index 0d729502..013f8178 100644
--- a/cloudinit/netinfo.py
+++ b/cloudinit/netinfo.py
@@ -126,7 +126,7 @@ def netdev_pformat():
max_len = len(max(netdev_s.splitlines(), key=len))
header = util.center("Net device info", "+", max_len)
lines.extend([header, netdev_s])
- return os.linesep.join(lines)
+ return "\n".join(lines)
def route_pformat():
@@ -149,11 +149,11 @@ def route_pformat():
max_len = len(max(route_s.splitlines(), key=len))
header = util.center("Route info", "+", max_len)
lines.extend([header, route_s])
- return os.linesep.join(lines)
+ return "\n".join(lines)
def debug_info():
lines = []
lines.append(netdev_pformat())
lines.append(route_pformat())
- return os.linesep.join(lines)
+ return "\n".join(lines)