[ovs-dev] [bug9769 2/4] python socket_util: Use correct fatal_signal function on error path.

Ethan Jackson ethan at nicira.com
Thu Mar 8 00:15:18 UTC 2012


Looks good, thanks.

Ethan

On Wed, Mar 7, 2012 at 15:46, Ben Pfaff <blp at nicira.com> wrote:
> 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 at nicira.com>
> ---
>  python/ovs/socket_util.py |    6 +-----
>  1 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py
> index 0a26c5d..d00d398 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
>
>
> --
> 1.7.2.5
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev



More information about the dev mailing list