projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-ofctl: Clarify in_port in manpage.
[openvswitch]
/
python
/
ovs
/
daemon.py
diff --git
a/python/ovs/daemon.py
b/python/ovs/daemon.py
index 5b9b06ac2d960c30c5ba6b523069c81477b0e2cb..184e7832fc264f8d0bf52dd2df8d56d7c5695a2b 100644
(file)
--- a/
python/ovs/daemon.py
+++ b/
python/ovs/daemon.py
@@
-457,13
+457,15
@@
def __read_pidfile(pidfile, delete_if_stale):
# Someone else has the pidfile locked.
try:
try:
# 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))
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)
except ValueError:
logging.warning("%s does not contain a pid" % pidfile)
- return -errno.EINVAL
+ error = -errno.EINVAL
+
+ return error
finally:
try:
file_handle.close()
finally:
try:
file_handle.close()