From: Ben Pfaff <blp@nicira.com>
Date: Wed, 7 Mar 2012 23:41:30 +0000 (-0800)
Subject: python socket_util: Use correct fatal_signal function on error path.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daad9316430795b0a9ee5d4ec89b9538101424ed;p=openvswitch

python socket_util: Use correct fatal_signal function on error path.

The correct function to call here is "remove_file_to_unlink".  That is,
since the file has already been unlinked there is no need to keep it on
the list of files to unlink.

However, "unlink_file_now" simplifies the code, so we might as well use
that.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py
index 0a26c5de..d00d3989 100644
--- a/python/ovs/socket_util.py
+++ b/python/ovs/socket_util.py
@@ -70,11 +70,7 @@ def make_unix_socket(style, nonblock, bind_path, connect_path):
     except socket.error, e:
         sock.close()
         if bind_path is not None:
-            try:
-                os.unlink(bind_path)
-            except OSError, e:
-                pass
-            ovs.fatal_signal.add_file_to_unlink(bind_path)
+            ovs.fatal_signal.unlink_file_now(bind_path)
         return get_exception_errno(e), None