From a4136a972bf86ae8eb5994652bae4ddcca131b6b Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Wed, 30 Aug 2023 14:17:56 -0700 Subject: [PATCH] ready option not needed --- pv2/importer/operation.py | 7 +++++-- pv2/mock/config.py | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pv2/importer/operation.py b/pv2/importer/operation.py index 6e58a90..978734d 100644 --- a/pv2/importer/operation.py +++ b/pv2/importer/operation.py @@ -195,7 +195,9 @@ class Import: if os.path.exists('/usr/sbin/restorecon'): processor.run_proc_foreground_shell(f'/usr/sbin/restorecon {dest_path}') @staticmethod - def upload_to_s3(repo_path, file_dict: dict, bucket, aws_key_id: str, aws_secret_key: str): + # pylint: disable=too-many-arguments + def upload_to_s3(repo_path, file_dict: dict, bucket, aws_key_id: str, + aws_secret_key: str, overwrite: bool = False): """ Upload an object to s3 """ @@ -204,7 +206,8 @@ class Import: source_path = f'{repo_path}/{name}' dest_name = sha upload.upload_to_s3(source_path, bucket, aws_key_id, - aws_secret_key, dest_name=dest_name) + aws_secret_key, dest_name=dest_name, + overwrite=overwrite) @staticmethod def import_lookaside_peridot_cli( diff --git a/pv2/mock/config.py b/pv2/mock/config.py index f5eefe3..efe9438 100644 --- a/pv2/mock/config.py +++ b/pv2/mock/config.py @@ -340,7 +340,6 @@ class MockConfig(MockConfigUtils): packager: str = 'Default Packager ', distsuffix=None, distribution=None, - bootstrap_image_ready=False, use_bootstrap_image=False, **kwargs ): @@ -420,7 +419,6 @@ class MockConfig(MockConfigUtils): 'rpmbuild_networking': enable_networking, 'print_main_output': print_main_output, 'macros': default_macros, - 'bootstrap_image_ready': bootstrap_image_ready, 'use_bootstrap_image': use_bootstrap_image, } self.__config_opts.update(**kwargs)