From 5f0b1d7a54575cb2ed791b06429e89bac43cd749 Mon Sep 17 00:00:00 2001 From: Jerry Date: Wed, 3 Apr 2019 18:55:23 +0800 Subject: [PATCH] repo.py: fix another bug --- repo.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/repo.py b/repo.py index 9de9a01..951af4d 100755 --- a/repo.py +++ b/repo.py @@ -175,8 +175,9 @@ def _regenerate(target_archs=ARCHS, just_symlink=False): if not basedir.exists(): logger.error(f'{arch} dir does not exist!') 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()] - filter_old_pkg([f for f in pkgfiles if f.name.endswith(PKG_SUFFIX)], keep_new=1, recycle=True) for pkgfile in pkgfiles: if pkgfile.name in repo_files: repo_files_count.append(pkgfile.name) @@ -219,9 +220,9 @@ def _update(): update_path = Path('updates') assert update_path.exists() pkgs_to_add = dict() - dir_list = [fpath for fpath in update_path.iterdir()] - 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: + filter_old_pkg([f for f in update_path.iterdir() if f.name.endswith(PKG_SUFFIX)], + keep_new=1, archive=True) + for pkg_to_add in update_path.iterdir(): if pkg_to_add.is_dir(): continue else: