opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 00:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of socket connection refusal.

Browse Source 
Currently if the socket was never started you get an error about
the service being started.  But if the service was started and later
stopped, you get a useless error.

This change causes the error to always be the same for connection refused.

The error message was also repeating the address twice which looked bad.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #1287
Approved by: baude
This commit is contained in:
Daniel J Walsh
2018-08-16 14:54:40 -04:00
committed by Atomic Bot
parent 50afe5b031
commit cd73f77414
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/python/podman/podman/client.py
View File

@ -175,12 +175,12 @@ class Client():
if not System(self._client).ping():
raise ConnectionRefusedError(
errno.ECONNREFUSED,
'Failed varlink connection "{}"'.format(address), address)
('Failed varlink connection "{}"').format(address))
except FileNotFoundError:
raise ConnectionError(
errno.ECONNREFUSED,
('Failed varlink connection "{}".'
' Is podman service running?').format(address), address)
' Is podman socket or service running?').format(address))
def __enter__(self):
"""Return `self` upon entering the runtime context."""