peridot/pv2
7
0
Fork 0
mirror of https://github.com/peridotbuild/pv2.git synced 2024-11-23 13:41:26 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

ready option not needed

Browse Source
This commit is contained in:
Louis Abel 2023-08-30 14:17:56 -07:00
parent 1f22fc3196
commit a4136a972b
Signed by: label
GPG Key ID: 2A6975660E424560
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pv2/importer/operation.py
View File

@ -195,7 +195,9 @@ class Import:
if os.path.exists('/usr/sbin/restorecon'): if os.path.exists('/usr/sbin/restorecon'):
processor.run_proc_foreground_shell(f'/usr/sbin/restorecon {dest_path}') processor.run_proc_foreground_shell(f'/usr/sbin/restorecon {dest_path}')
@staticmethod @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 Upload an object to s3
""" """
@ -204,7 +206,8 @@ class Import:
source_path = f'{repo_path}/{name}' source_path = f'{repo_path}/{name}'
dest_name = sha dest_name = sha
upload.upload_to_s3(source_path, bucket, aws_key_id, 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 @staticmethod
def import_lookaside_peridot_cli( def import_lookaside_peridot_cli(

2
pv2/mock/config.py
View File

@ -340,7 +340,6 @@ class MockConfig(MockConfigUtils):
packager: str = 'Default Packager <packager@noone.home>', packager: str = 'Default Packager <packager@noone.home>',
distsuffix=None, distsuffix=None,
distribution=None, distribution=None,
bootstrap_image_ready=False,
use_bootstrap_image=False, use_bootstrap_image=False,
**kwargs **kwargs
): ):
@ -420,7 +419,6 @@ class MockConfig(MockConfigUtils):
'rpmbuild_networking': enable_networking, 'rpmbuild_networking': enable_networking,
'print_main_output': print_main_output, 'print_main_output': print_main_output,
'macros': default_macros, 'macros': default_macros,
'bootstrap_image_ready': bootstrap_image_ready,
'use_bootstrap_image': use_bootstrap_image, 'use_bootstrap_image': use_bootstrap_image,
} }
self.__config_opts.update(**kwargs) self.__config_opts.update(**kwargs)