Merge pull request #1878 from ogayot/console-conf-network-crash
network: ensure we pass tasks to asyncio.wait
This commit is contained in:
commit
ea909d1428
|
@ -169,7 +169,8 @@ class NetworkController(BaseNetworkController, SubiquityController):
|
||||||
with context.child("wait_dhcp"):
|
with context.child("wait_dhcp"):
|
||||||
try:
|
try:
|
||||||
await asyncio.wait_for(
|
await asyncio.wait_for(
|
||||||
asyncio.wait({e.wait() for e in dhcp_events}), 10
|
asyncio.wait({asyncio.create_task(e.wait()) for e in dhcp_events}),
|
||||||
|
10,
|
||||||
)
|
)
|
||||||
except asyncio.TimeoutError:
|
except asyncio.TimeoutError:
|
||||||
pass
|
pass
|
||||||
|
|
|
@ -391,7 +391,9 @@ class BaseNetworkController(BaseController):
|
||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
await asyncio.wait_for(asyncio.wait({e.wait() for e in dhcp_events}), 10)
|
await asyncio.wait_for(
|
||||||
|
asyncio.wait({asyncio.create_task(e.wait()) for e in dhcp_events}), 10
|
||||||
|
)
|
||||||
except asyncio.TimeoutError:
|
except asyncio.TimeoutError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue