From: Ethan Jackson <ethan@nicira.com>
Date: Fri, 16 Sep 2011 23:46:18 +0000 (-0700)
Subject: daemon.py: Silence return warning.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a8859b0a4fe11c6418fe07dbb9b1c403a3986b4;p=openvswitch

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)
---

diff --git a/python/ovs/daemon.py b/python/ovs/daemon.py
index 5b9b06ac..184e7832 100644
--- 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:
-            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()