mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
0ab14d82b1
A mostly straightforward uprev. Unfortunately a required patch for
python3 is only available on a non-release branch so we must carry it
in order to build (the discussion on the mailing list was that an
uprev might have avoided this, but this is not the case).
The ptest results are similar to after the v2.11 uprev
ERROR: 2413 tests were run,
23 failed unexpectedly.
383 tests were skipped.
NOTE, however, that they have now marked many tests as 'skipped', such
as the python2 results, so the failed and skipped numbers have
essentially swapped with each other. The failed tests were in the
following areas:
checkpatch.at (5)
ovs-ofctl.at (1)
dpif-netdev.at (1)
ofproto-dpif.at (6)
bridge.at (2)
ovn.at (2)
ovn-controller-vtep.at (6)
Most were issues with the test or expectations that source code would
be available. There might be an issue around packaging of
"/vswitchd/vswitch.ovsschema" but we should be able to overlook this
for now, as we have with previous versions.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From d84109f0b60096ce71cd0537b31b69a7f5ea8756 Mon Sep 17 00:00:00 2001
|
|
From: Flavio Leitner <fbl@sysclose.org>
|
|
Date: Sat, 14 Sep 2019 20:17:28 -0300
|
|
Subject: [PATCH] ovsdb-idlc.in: fix dict change during iteration.
|
|
|
|
Commit d84109f0b600 from git://github.com/openvswitch/ovs.git
|
|
|
|
Python3 complains if a dict key is changed during the
|
|
iteration.
|
|
|
|
Use list() to create a copy of it.
|
|
|
|
Traceback (most recent call last):
|
|
File "./ovsdb/ovsdb-idlc.in", line 1581, in <module>
|
|
func(*args[1:])
|
|
File "./ovsdb/ovsdb-idlc.in", line 185, in printCIDLHeader
|
|
replace_cplusplus_keyword(schema)
|
|
File "./ovsdb/ovsdb-idlc.in", line 179, in replace_cplusplus_keyword
|
|
for columnName in table.columns:
|
|
RuntimeError: dictionary keys changed during iteration
|
|
|
|
Signed-off-by: Flavio Leitner <fbl@sysclose.org>
|
|
Signed-off-by: Ben Pfaff <blp@ovn.org>
|
|
[MA: Upstream-Status: Submitted]
|
|
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
|
---
|
|
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 40fef39..22d0a4e 100755
|
|
--- a/ovsdb/ovsdb-idlc.in
|
|
+++ b/ovsdb/ovsdb-idlc.in
|
|
@@ -176,7 +176,7 @@ def replace_cplusplus_keyword(schema):
|
|
'wchar_t', 'while', 'xor', 'xor_eq'}
|
|
|
|
for tableName, table in schema.tables.items():
|
|
- for columnName in table.columns:
|
|
+ for columnName in list(table.columns):
|
|
if columnName in keywords:
|
|
table.columns[columnName + '_'] = table.columns.pop(columnName)
|
|
|
|
--
|
|
2.7.4
|
|
|