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

use a cleanup function

Browse Source
This commit is contained in:
Louis Abel 2023-07-06 16:32:42 -07:00
parent 3138af9c00
commit edd6b41608
Signed by: label
GPG Key ID: 3331F061D1D9990E
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pv2/importer/operation.py
View File

@ -212,6 +212,17 @@ class Import:
return file_dict return file_dict
@staticmethod
def perform_cleanup(list_of_dirs: list):
"""
Clean up whatever is thrown at us
"""
for directory in list_of_dirs:
try:
shutil.rmtree(directory)
except Exception as exc:
raise err.FileNotFound(f'{directory} could not be deleted. Please check. {exc}')
# pylint: disable=too-many-instance-attributes # pylint: disable=too-many-instance-attributes
class SrpmImport(Import): class SrpmImport(Import):
""" """
@ -334,7 +345,7 @@ class SrpmImport(Import):
# Raise an error if the tag already exists. Force the importer to tag # Raise an error if the tag already exists. Force the importer to tag
# manually. # manually.
if import_tag in repo_tags: if import_tag in repo_tags:
shutil.rmtree(git_repo_path) self.perform_cleanup([git_repo_path])
raise err.GitCommitError(f'Git tag already exists: {import_tag}') raise err.GitCommitError(f'Git tag already exists: {import_tag}')
self.unpack_srpm(self.srpm_path, git_repo_path) self.unpack_srpm(self.srpm_path, git_repo_path)
@ -355,13 +366,13 @@ class SrpmImport(Import):
gitutil.commit(repo, commit_msg) gitutil.commit(repo, commit_msg)
ref = gitutil.tag(repo, import_tag, commit_msg) ref = gitutil.tag(repo, import_tag, commit_msg)
gitutil.push(repo, ref=ref) gitutil.push(repo, ref=ref)
shutil.rmtree(git_repo_path) self.perform_cleanup([git_repo_path])
return True return True
# The most recent commit is assumed to be tagged also. We will not # The most recent commit is assumed to be tagged also. We will not
# push. Force the importer to tag manually. # push. Force the importer to tag manually.
print('Nothing to push') print('Nothing to push')
shutil.rmtree(git_repo_path) self.perform_cleanup([git_repo_path])
return False return False
@property @property
@ -624,8 +635,7 @@ class GitImport(Import):
commit_msg = f'import {srpm_nvr}' commit_msg = f'import {srpm_nvr}'
# unpack it to new dir, move lookaside if needed, tag and push # unpack it to new dir, move lookaside if needed, tag and push
if import_tag in repo_tags: if import_tag in repo_tags:
shutil.rmtree(source_git_repo_path) self.perform_cleanup([source_git_repo_path, dest_git_repo_path])
shutil.rmtree(dest_git_repo_path)
raise err.GitCommitError(f'Git tag already exists: {import_tag}') raise err.GitCommitError(f'Git tag already exists: {import_tag}')
self.unpack_srpm(packed_srpm, dest_git_repo_path) self.unpack_srpm(packed_srpm, dest_git_repo_path)
@ -645,12 +655,10 @@ class GitImport(Import):
gitutil.commit(dest_repo, commit_msg) gitutil.commit(dest_repo, commit_msg)
ref = gitutil.tag(dest_repo, import_tag, commit_msg) ref = gitutil.tag(dest_repo, import_tag, commit_msg)
gitutil.push(dest_repo, ref=ref) gitutil.push(dest_repo, ref=ref)
shutil.rmtree(source_git_repo_path) self.perform_cleanup([source_git_repo_path, dest_git_repo_path])
shutil.rmtree(dest_git_repo_path)
return True return True
print('Nothing to push') print('Nothing to push')
shutil.rmtree(source_git_repo_path) self.perform_cleanup([source_git_repo_path, dest_git_repo_path])
shutil.rmtree(dest_git_repo_path)
return False return False
def __get_actual_lookaside_url(self, filename, hashtype, checksum): def __get_actual_lookaside_url(self, filename, hashtype, checksum):