Archlinux-Jerry/buildbot
1
0
Fork 0
mirror of https://github.com/archlinux-jerry/buildbot synced 2024-11-25 22:40:40 +08:00
Code Issues Releases Wiki Activity

repo.py bug fix

Browse source
This commit is contained in:
JerryXiao 2019-04-03 18:49:07 +08:00
parent 96c09e9321
commit f76ac5294c
Signed by: Jerry
GPG key ID: 9D9CE43650FF2BAA
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
repo.py
View file

@ -122,15 +122,20 @@ def filter_old_pkg(fpaths, keep_new=1, archive=False, recycle=False):
new_pkgs += family new_pkgs += family
for pkg in old_pkgs: for pkg in old_pkgs:
fullpath = fpaths[0].parent / pkg.fname fullpath = fpaths[0].parent / pkg.fname
sigpath = fpaths[0].parent / f'{str(pkg.fname)}.sig'
if archive: if archive:
archive_pkg(fullpath) archive_pkg(fullpath)
if sigpath.exists():
archive_pkg(sigpath)
elif recycle: elif recycle:
throw_away(fullpath) throw_away(fullpath)
if sigpath.exists():
throw_away(sigpath)
return (new_pkgs, old_pkgs) return (new_pkgs, old_pkgs)
def _clean_archive(keep_new=3): def _clean_archive(keep_new=3):
basedir = Path('archive') basedir = Path('archive')
dir_list = [fpath for fpath in basedir.iterdir()] dir_list = [fpath for fpath in basedir.iterdir() if fpath.name.endswith(PKG_SUFFIX)]
filter_old_pkg(dir_list, keep_new=keep_new, recycle=True) filter_old_pkg(dir_list, keep_new=keep_new, recycle=True)
def _regenerate(target_archs=ARCHS, just_symlink=False): def _regenerate(target_archs=ARCHS, just_symlink=False):
@ -171,7 +176,7 @@ def _regenerate(target_archs=ARCHS, just_symlink=False):
logger.error(f'{arch} dir does not exist!') logger.error(f'{arch} dir does not exist!')
continue continue
pkgfiles = [f for f in basedir.iterdir()] pkgfiles = [f for f in basedir.iterdir()]
filter_old_pkg(pkgfiles, keep_new=1, recycle=True) filter_old_pkg([f for f in pkgfiles if f.name.endswith(PKG_SUFFIX)], keep_new=1, recycle=True)
for pkgfile in pkgfiles: for pkgfile in pkgfiles:
if pkgfile.name in repo_files: if pkgfile.name in repo_files:
repo_files_count.append(pkgfile.name) repo_files_count.append(pkgfile.name)
@ -215,7 +220,7 @@ def _update():
assert update_path.exists() assert update_path.exists()
pkgs_to_add = dict() pkgs_to_add = dict()
dir_list = [fpath for fpath in update_path.iterdir()] dir_list = [fpath for fpath in update_path.iterdir()]
filter_old_pkg(dir_list, keep_new=1, archive=True) filter_old_pkg([f for f in dir_list if f.name.endswith(PKG_SUFFIX)], keep_new=1, archive=True)
for pkg_to_add in dir_list: for pkg_to_add in dir_list:
if pkg_to_add.is_dir(): if pkg_to_add.is_dir():
continue continue