From dcf8aa39690e823b341305d24605597e039e29c5 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Wed, 6 Dec 2017 17:45:04 +0100 Subject: [PATCH] merge.py: Copy over data source if it exists Signed-off-by: Boris Ranto --- tools/merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/merge.py b/tools/merge.py index 29e6699..710c24e 100755 --- a/tools/merge.py +++ b/tools/merge.py @@ -26,7 +26,7 @@ def update(a, b): ra = a['rows'][row_nr] rb = b['rows'][row_nr] for panel_nr in range(len(ra['panels'])): - if 'datasource' in ra['panels'][panel_nr].keys(): + if 'datasource' in rb['panels'][panel_nr].keys(): ra['panels'][panel_nr]['datasource'] = rb['panels'][panel_nr]['datasource'] if 'targets' not in ra['panels'][panel_nr]: continue -- 2.47.3