From: Ben Pfaff <blp@nicira.com>
Date: Wed, 7 Mar 2012 23:38:27 +0000 (-0800)
Subject: python socket_util: Don't try to unbind None bind_path.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaae5809c0115635b600043d35b4233572228e15;p=openvswitch

python socket_util: Don't try to unbind None bind_path.

This bug is not exposed in the current tree, because no existing caller
passes None as bind_path.

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

diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py
index 83c82046..0a26c5de 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,11 +69,11 @@ 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:
+            try:
+                os.unlink(bind_path)
+            except OSError, e:
+                pass
             ovs.fatal_signal.add_file_to_unlink(bind_path)
         return get_exception_errno(e), None