projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
16267: implement review feedback.
[arvados.git]
/
tools
/
arvbox
/
lib
/
arvbox
/
docker
/
yml_override.py
diff --git
a/tools/arvbox/lib/arvbox/docker/yml_override.py
b/tools/arvbox/lib/arvbox/docker/yml_override.py
index 446448f5eb78766d118845ca28d7255b45dc283a..7f35ac1d686984fbbc51101f8aa1a508e8ae28e0 100755
(executable)
--- a/
tools/arvbox/lib/arvbox/docker/yml_override.py
+++ b/
tools/arvbox/lib/arvbox/docker/yml_override.py
@@
-20,7
+20,7
@@
with open(fn) as f:
def recursiveMerge(a, b):
if isinstance(a, dict) and isinstance(b, dict):
for k in b:
- print
k
+ print
(k)
a[k] = recursiveMerge(a.get(k), b[k])
return a
else: