2
0
mirror of https://github.com/openvswitch/ovs synced 2025-09-05 00:35:33 +00:00

daemon.py: Silence return warning.

Pychecker complains about __read_pidfile() having too may returns.
I personally think the function is fine, but it's easy enough to
reduce them.

python/ovs/daemon.py:395: Function (__read_pidfile) has too many
returns (12)
This commit is contained in:
Ethan Jackson
2011-09-16 16:46:18 -07:00
parent 591c20651f
commit 2a8859b0a4

View File

@@ -457,13 +457,15 @@ def __read_pidfile(pidfile, delete_if_stale):
# Someone else has the pidfile locked.
try:
try:
return int(file_handle.readline())
error = int(file_handle.readline())
except IOError, e:
logging.warning("%s: read: %s" % (pidfile, e.strerror))
return -e.errno
error = -e.errno
except ValueError:
logging.warning("%s does not contain a pid" % pidfile)
return -errno.EINVAL
error = -errno.EINVAL
return error
finally:
try:
file_handle.close()