mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
500e5d2ad5
Refresh patches with devtool command to fix do_patch warning. Drop CVE-2017-9263.patch since it had been fixed upstream. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 8557d51e8c7325a17219911e9a65eeb3946e869f Mon Sep 17 00:00:00 2001
|
|
From: Jason Wessel <jason.wessel@windriver.com>
|
|
Date: Thu, 29 Jun 2017 20:33:23 -0700
|
|
Subject: [PATCH] Python3 compatibility: execfile to exec
|
|
|
|
Commit a4d10a7ca937d73873f6f98619d88682e69f5dbe from
|
|
https://github.com/openvswitch/ovs.git
|
|
|
|
Allow compability with python3 and python2 by changing execfile() to
|
|
exec().
|
|
|
|
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
|
|
Signed-off-by: Ben Pfaff <blp@ovn.org>
|
|
|
|
---
|
|
ovsdb/ovsdb-idlc.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
|
|
index e7e1c6b..e1551f9 100755
|
|
--- a/ovsdb/ovsdb-idlc.in
|
|
+++ b/ovsdb/ovsdb-idlc.in
|
|
@@ -17,7 +17,7 @@ def parseSchema(filename):
|
|
|
|
def annotateSchema(schemaFile, annotationFile):
|
|
schemaJson = ovs.json.from_file(schemaFile)
|
|
- execfile(annotationFile, globals(), {"s": schemaJson})
|
|
+ exec(compile(open(annotationFile, "rb").read(), annotationFile, 'exec'), globals(), {"s": schemaJson})
|
|
ovs.json.to_stream(schemaJson, sys.stdout)
|
|
sys.stdout.write('\n')
|
|
|