python: Fix lxc-ls's usage of get_ips()

The recent port of get_ips() from pure python to the C API came with a couple of API changes for that function call (as were highlighted in the commit message). I somehow didn't notice that lxc-ls was still calling with the old API and so was crashing whenever it was asked to show the ipv4 or ipv6 address. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

python: Fix lxc-ls's usage of get_ips()
ad5f1515 · Stéphane Graber · 5bb4a226 · ad5f1515
Unverified Commit ad5f1515 authored May 22, 2013 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lxc-ls src/lxc/lxc-ls +2 -2

No files found.
--- a/src/lxc/lxc-ls
+++ b/src/lxc/lxc-ls
@@ -202,10 +202,10 @@ for container_name in lxc.list_containers(config_path=lxcpath):
            entry['pid'] = str(container.init_pid)

    # Get the IPs
-    for protocol in ('ipv4', 'ipv6'):
+    for family, protocol in {'inet': 'ipv4', 'inet6': 'ipv6'}.items():
        if protocol in args.fancy_format or args.nesting:
            entry[protocol] = "-"
-            ips = container.get_ips(protocol=protocol, timeout=1)
+            ips = container.get_ips(family=family)
            if ips:
                entry[protocol] = ", ".join(ips)