From eeefc7c341e863ee5f571648baea7b7083d431ee Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Tue, 9 Jan 2024 11:16:20 -0800 Subject: [PATCH] rrs_upstream_history: allow skip update_data Fixes: Traceback (most recent call last): File "/opt/layerindex/./rrs/tools/rrs_upstream_history.py", line 210, in set_regexes(recipe_data) File "/opt/layerindex/./rrs/tools/rrs_upstream_history.py", line 73, in set_regexes bb.data.update_data(localdata) AttributeError: module 'bb.data' has no attribute 'update_data' bb.data.update_data was dropped in: 584989ed 'data/data_smart/build: Clean up datastore finalize/update_data references' While we are here, drop some trailing whitespace. Signed-off-by: Tim Orling --- rrs/tools/rrs_upstream_history.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rrs/tools/rrs_upstream_history.py b/rrs/tools/rrs_upstream_history.py index 7dbf64c..25f4b20 100755 --- a/rrs/tools/rrs_upstream_history.py +++ b/rrs/tools/rrs_upstream_history.py @@ -70,7 +70,10 @@ def set_regexes(d): localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', True)) - bb.data.update_data(localdata) + try: + bb.data.update_data(localdata) + except AttributeError: + pass for var in variables: new_value = localdata.getVar(var, True) @@ -107,7 +110,7 @@ def get_upstream_info(layerbranch, recipe_data, result): ru.date = ru_info['datetime'] pv, _, _ = get_recipe_pv_without_srcpv(recipe_pv, - get_pv_type(recipe_pv)) + get_pv_type(recipe_pv)) upv, _, _ = get_recipe_pv_without_srcpv(ru_info['version'], get_pv_type(ru_info['version'])) @@ -143,7 +146,7 @@ if __name__=="__main__": parser.add_option("-d", "--debug", help = "Enable debug output", action="store_const", const=logging.DEBUG, dest="loglevel", default=logging.INFO) - + parser.add_option("--dry-run", help = "Do not write any data back to the database", action="store_true", dest="dry_run", default=False)