From afd9a22b1b13b1b3e996f3eecea899993aa069dc Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Wed, 17 Apr 2013 17:35:04 -0700 Subject: [PATCH] python: fix a typo error in python/ovs/socket_util.py. The commit 89d7ffa9 (python: Workaround UNIX socket path length limits), fixes most failed tests. But it has a typo and the typo causes the failure of test when the path length is very long (e.g. more than 90 characters). This patch fixes the above issue. Signed-off-by: Alex Wang Signed-off-by: Ben Pfaff --- AUTHORS | 1 + python/ovs/socket_util.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 56e746126..c11b26c5f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,6 +3,7 @@ signed off on commits in the Open vSwitch version control repository. Aaron Rosen arosen@clemson.edu Alexey I. Froloff raorn@altlinux.org +Alex Wang alexw@nicira.com Andrew Evans aevans@nicira.com Andrew Lambeth wal@nicira.com Andy Southgate andy.southgate@citrix.com diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py index 7bfefc49c..7dac5bb37 100644 --- a/python/ovs/socket_util.py +++ b/python/ovs/socket_util.py @@ -87,7 +87,7 @@ def make_unix_socket(style, nonblock, bind_path, connect_path): try: connect_dirfd = os.open(dirname, os.O_DIRECTORY | os.O_RDONLY) except OSError, err: - return get_exception_errno(e), None + return get_exception_errno(err), None short_connect_path = "/proc/self/fd/%d/%s" % (connect_dirfd, basename) if bind_path is not None: @@ -96,7 +96,7 @@ def make_unix_socket(style, nonblock, bind_path, connect_path): try: bind_dirfd = os.open(dirname, os.O_DIRECTORY | os.O_RDONLY) except OSError, err: - return get_exception_errno(e), None + return get_exception_errno(err), None short_bind_path = "/proc/self/fd/%d/%s" % (bind_dirfd, basename) try: -- 2.20.1