X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=python%2Fovs%2Fsocket_util.py;h=d00d3989b699c07f791417c61f9e7245942f6133;hb=2dc7590de5e0adae1e332ff84c0c8af264f403b9;hp=83c82046e903515078c20a084157fc3c4b63fead;hpb=3a656eafb96ab8a474e943baabdb2679d0a6b0ef;p=openvswitch

diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py
index 83c82046..d00d3989 100644
--- a/python/ovs/socket_util.py
+++ b/python/ovs/socket_util.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 Nicira Networks
+# Copyright (c) 2010, 2012 Nicira Networks
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -69,12 +69,8 @@ def make_unix_socket(style, nonblock, bind_path, connect_path):
         return 0, sock
     except socket.error, e:
         sock.close()
-        try:
-            os.unlink(bind_path)
-        except OSError, e:
-            pass
         if bind_path is not None:
-            ovs.fatal_signal.add_file_to_unlink(bind_path)
+            ovs.fatal_signal.unlink_file_now(bind_path)
         return get_exception_errno(e), None