proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-30 03:21:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Stéphane Graber 2013-05-22 22:28:43 -04:00
parent 5bb4a226eb
commit ad5f151515
No known key found for this signature in database
GPG Key ID: C638974D64792D67
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lxc/lxc-ls
View File

@ -202,10 +202,10 @@ for container_name in lxc.list_containers(config_path=lxcpath):
entry['pid'] = str(container.init_pid) entry['pid'] = str(container.init_pid)
# Get the IPs # 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: if protocol in args.fancy_format or args.nesting:
entry[protocol] = "-" entry[protocol] = "-"
ips = container.get_ips(protocol=protocol, timeout=1) ips = container.get_ips(family=family)
if ips: if ips:
entry[protocol] = ", ".join(ips) entry[protocol] = ", ".join(ips)