Merge branch 'master' into forward-port

[sliver-openvswitch.git] / python / ovs / socket_util.py

diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py
index 0a26c5d..a8e8d92 100644 (file)
--- a/python/ovs/socket_util.py
+++ b/python/ovs/socket_util.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012 Nicira Networks
+# Copyright (c) 2010, 2012 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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