UBUNTU: [Packaging] config-check: Handle new annotations format 4
For derivatives, we could end up in a situation where the master has
already switched over to the new annotations format 4 but the derivative
still wants to use the old scheme. In that case, the config-check script
is still used and needs to properly handle the new annotations format 4
(in case the derivative includes the annotations from the master).
Ignore: yes
Signed-off-by: Juerg Haefliger <email address hidden>
Acked-by: Andrea Righi <email address hidden>
Acked-by: Andrei Gherzan <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>
The '|=' update operator for merging dicts is available starting in
python 3.9 however in focal we have python 3.8, which causes the
annotation parsing script to crash.
Support also the old way of merging dicts available since python 3.5
that uses dict unpacking, e.g. dict1 = {**dict1, **dict2}
Signed-off-by: Luke Nowakowski-Krijger <email address hidden>
Signed-off-by: Andrea Righi <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Acked-by: Luke Nowakowski-Krijger <email address hidden>
Signed-off-by: Luke Nowakowski-Krijger <email address hidden>
(cherry picked from commit b0d6f44caf327256d93bdc42a630992e6866db07)
Signed-off-by: Tim Gardner <email address hidden>
