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

repo.py: fix another bug

Browse source
This commit is contained in:
JerryXiao 2019-04-03 18:55:23 +08:00
parent f76ac5294c
commit 5f0b1d7a54
Signed by: Jerry
GPG key ID: 9D9CE43650FF2BAA
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
repo.py
View file

@ -175,8 +175,9 @@ def _regenerate(target_archs=ARCHS, just_symlink=False):
if not basedir.exists(): if not basedir.exists():
logger.error(f'{arch} dir does not exist!') logger.error(f'{arch} dir does not exist!')
continue continue
filter_old_pkg([f for f in basedir.iterdir() if f.name.endswith(PKG_SUFFIX)],
keep_new=1, recycle=True)
pkgfiles = [f for f in basedir.iterdir()] pkgfiles = [f for f in basedir.iterdir()]
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)
@ -219,9 +220,9 @@ def _update():
update_path = Path('updates') update_path = Path('updates')
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()] filter_old_pkg([f for f in update_path.iterdir() if f.name.endswith(PKG_SUFFIX)],
filter_old_pkg([f for f in dir_list if f.name.endswith(PKG_SUFFIX)], keep_new=1, archive=True) keep_new=1, archive=True)
for pkg_to_add in dir_list: for pkg_to_add in update_path.iterdir():
if pkg_to_add.is_dir(): if pkg_to_add.is_dir():
continue continue
else: else: