diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2018-06-05 09:47:35 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-06-05 12:01:05 -0400 |
commit | d4c5cd1d939ac9bc8f4e2065e5afa83b1fa00418 (patch) | |
tree | 00a71160f4ee549b5387c9e7d545e1b9edccbe1d /recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch | |
parent | 343b40ba0d44caeb22013a1586ae2159e415bd4c (diff) | |
download | meta-virtualization-d4c5cd1d939ac9bc8f4e2065e5afa83b1fa00418.tar.gz |
openvswitch: remove unused patches
commit 1fd1ff372014 [openvswitch: uprev to v2.9.2] left a bunch of
unused patches in place. Remove unreferenced patches as they are no
longer needed.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch')
-rw-r--r-- | recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch b/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch deleted file mode 100644 index 70abd263..00000000 --- a/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | From c0ba116eab401431b4f11b66bd7d1b42741b03c3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jason Wessel <jason.wessel@windriver.com> | ||
3 | Date: Thu, 29 Jun 2017 20:33:23 -0700 | ||
4 | Subject: [PATCH] Python3 compatibility: exception cleanup | ||
5 | |||
6 | Commit 52e4a477f0b3c0a0ece7adeede6e06e07814f8b9 from | ||
7 | https://github.com/openvswitch/ovs.git | ||
8 | |||
9 | The exception syntax which is compatible with python2 and python3 is | ||
10 | to use the "as" form for "except:". | ||
11 | |||
12 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
13 | Signed-off-by: Ben Pfaff <blp@ovn.org> | ||
14 | |||
15 | --- | ||
16 | build-aux/extract-ofp-fields | 2 +- | ||
17 | ovsdb/ovsdb-doc | 4 ++-- | ||
18 | ovsdb/ovsdb-idlc.in | 4 ++-- | ||
19 | 3 files changed, 5 insertions(+), 5 deletions(-) | ||
20 | |||
21 | diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields | ||
22 | index 80c7d35..6286c9c 100755 | ||
23 | --- a/build-aux/extract-ofp-fields | ||
24 | +++ b/build-aux/extract-ofp-fields | ||
25 | @@ -784,7 +784,7 @@ if __name__ == "__main__": | ||
26 | try: | ||
27 | options, args = getopt.gnu_getopt(sys.argv[1:], 'h', | ||
28 | ['help', 'ovs-version=']) | ||
29 | - except getopt.GetoptError, geo: | ||
30 | + except getopt.GetoptError as geo: | ||
31 | sys.stderr.write("%s: %s\n" % (argv0, geo.msg)) | ||
32 | sys.exit(1) | ||
33 | |||
34 | diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc | ||
35 | index e82ad59..9448713 100755 | ||
36 | --- a/ovsdb/ovsdb-doc | ||
37 | +++ b/ovsdb/ovsdb-doc | ||
38 | @@ -278,7 +278,7 @@ if __name__ == "__main__": | ||
39 | options, args = getopt.gnu_getopt(sys.argv[1:], 'hV', | ||
40 | ['er-diagram=', | ||
41 | 'version=', 'help']) | ||
42 | - except getopt.GetoptError, geo: | ||
43 | + except getopt.GetoptError as geo: | ||
44 | sys.stderr.write("%s: %s\n" % (argv0, geo.msg)) | ||
45 | sys.exit(1) | ||
46 | |||
47 | @@ -306,7 +306,7 @@ if __name__ == "__main__": | ||
48 | if len(line): | ||
49 | print(line) | ||
50 | |||
51 | - except error.Error, e: | ||
52 | + except error.Error as e: | ||
53 | sys.stderr.write("%s: %s\n" % (argv0, e.msg)) | ||
54 | sys.exit(1) | ||
55 | |||
56 | diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in | ||
57 | index 62442ee..e7e1c6b 100755 | ||
58 | --- a/ovsdb/ovsdb-idlc.in | ||
59 | +++ b/ovsdb/ovsdb-idlc.in | ||
60 | @@ -1098,7 +1098,7 @@ if __name__ == "__main__": | ||
61 | ['directory', | ||
62 | 'help', | ||
63 | 'version']) | ||
64 | - except getopt.GetoptError, geo: | ||
65 | + except getopt.GetoptError as geo: | ||
66 | sys.stderr.write("%s: %s\n" % (argv0, geo.msg)) | ||
67 | sys.exit(1) | ||
68 | |||
69 | @@ -1136,7 +1136,7 @@ if __name__ == "__main__": | ||
70 | sys.exit(1) | ||
71 | |||
72 | func(*args[1:]) | ||
73 | - except ovs.db.error.Error, e: | ||
74 | + except ovs.db.error.Error as e: | ||
75 | sys.stderr.write("%s: %s\n" % (argv0, e)) | ||
76 | sys.exit(1) | ||
77 | |||