peridot/pv2
7
0
Fork 0
mirror of https://github.com/peridotbuild/pv2.git synced 2024-11-24 06:01:25 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

add s3 uploader

Browse Source
This commit is contained in:
Louis Abel 2023-08-24 15:26:07 -07:00
parent 46ad89c403
commit 67106beac7
Signed by: label
GPG Key ID: 2A6975660E424560
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pv2/importer/.operation.py.swp
View File

Binary file not shown.

24
pv2/importer/operation.py
View File

@ -464,12 +464,6 @@ class SrpmImport(Import):
self.generate_metadata(git_repo_path, self.rpm_name, sources) self.generate_metadata(git_repo_path, self.rpm_name, sources)
self.generate_filesum(git_repo_path, self.rpm_name, self.srpm_hash) self.generate_filesum(git_repo_path, self.rpm_name, self.srpm_hash)
if skip_lookaside:
self.skip_import_lookaside(git_repo_path, sources)
else:
self.import_lookaside(git_repo_path, self.rpm_name, branch,
sources, self.dest_lookaside)
if s3_upload: if s3_upload:
# I don't want to blatantly blow up here yet. # I don't want to blatantly blow up here yet.
if len(self.__aws_access_key_id) == 0 or len(self.__aws_access_key) == 0 or len(self.__aws_bucket) == 0: if len(self.__aws_access_key_id) == 0 or len(self.__aws_access_key) == 0 or len(self.__aws_bucket) == 0:
@ -483,6 +477,12 @@ class SrpmImport(Import):
self.__aws_access_key, self.__aws_access_key,
) )
if skip_lookaside:
self.skip_import_lookaside(git_repo_path, sources)
else:
self.import_lookaside(git_repo_path, self.rpm_name, branch,
sources, self.dest_lookaside)
# Temporary hack like with git. # Temporary hack like with git.
dest_gitignore_file = f'{git_repo_path}/.gitignore' dest_gitignore_file = f'{git_repo_path}/.gitignore'
if os.path.exists(dest_gitignore_file): if os.path.exists(dest_gitignore_file):
@ -796,12 +796,6 @@ class GitImport(Import):
self.generate_metadata(dest_git_repo_path, self.rpm_name, sources) self.generate_metadata(dest_git_repo_path, self.rpm_name, sources)
self.generate_filesum(dest_git_repo_path, self.rpm_name, "Direct Git Import") self.generate_filesum(dest_git_repo_path, self.rpm_name, "Direct Git Import")
if skip_lookaside:
self.skip_import_lookaside(dest_git_repo_path, sources)
else:
self.import_lookaside(dest_git_repo_path, self.rpm_name, dest_branch,
sources, self.dest_lookaside)
if s3_upload: if s3_upload:
# I don't want to blatantly blow up here yet. # I don't want to blatantly blow up here yet.
if len(self.__aws_access_key_id) == 0 or len(self.__aws_access_key) == 0 or len(self.__aws_bucket) == 0: if len(self.__aws_access_key_id) == 0 or len(self.__aws_access_key) == 0 or len(self.__aws_bucket) == 0:
@ -815,6 +809,12 @@ class GitImport(Import):
self.__aws_access_key, self.__aws_access_key,
) )
if skip_lookaside:
self.skip_import_lookaside(dest_git_repo_path, sources)
else:
self.import_lookaside(dest_git_repo_path, self.rpm_name, dest_branch,
sources, self.dest_lookaside)
# This is a temporary hack. There are cases that the .gitignore that's # This is a temporary hack. There are cases that the .gitignore that's
# provided by upstream errorneouly keeps out certain sources, despite # provided by upstream errorneouly keeps out certain sources, despite
# the fact that they were pushed before. We're killing off any # the fact that they were pushed before. We're killing off any