From fff2ee593b4beae6c48bb584e615e73c6853d191 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 14 Sep 2020 08:38:44 +0200 Subject: [PATCH] buildqueue: Default to not include vcs packages again Most of them are broken and don't produce the version they advertise, which makes it hard to deal with them in an automated fashion. --- app/api.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/api.py b/app/api.py index 0d9e9a1..737e1e1 100644 --- a/app/api.py +++ b/app/api.py @@ -5,7 +5,7 @@ from fastapi.responses import JSONResponse from typing import Tuple, Dict, List, Set, Any, Iterable from .appstate import state, SrcInfoPackage -from .utils import version_is_newer_than +from .utils import version_is_newer_than, package_name_is_vcs router = APIRouter() @@ -36,7 +36,7 @@ def cmp_func(e1: Dict, e2: Dict) -> int: @router.get('/buildqueue') -async def index(request: Request, response: Response, include_new: bool = True, include_update: bool = True) -> Response: +async def index(request: Request, response: Response, include_new: bool = True, include_update: bool = True, include_vcs: bool = False) -> Response: srcinfos = [] # packages that should be updated @@ -45,6 +45,8 @@ async def index(request: Request, response: Response, include_new: bool = True, for k, p in sorted(s.packages.items()): if p.name in state.sourceinfos: srcinfo = state.sourceinfos[p.name] + if package_name_is_vcs(s.name) and not include_vcs: + continue if not version_is_newer_than(srcinfo.build_version, p.version): continue srcinfos.append(srcinfo) @@ -53,6 +55,8 @@ async def index(request: Request, response: Response, include_new: bool = True, if include_new: available: Dict[str, List[SrcInfoPackage]] = {} for srcinfo in state.sourceinfos.values(): + if package_name_is_vcs(srcinfo.pkgbase) and not include_vcs: + continue available.setdefault(srcinfo.pkgname, []).append(srcinfo) for s in state.sources.values(): for p in s.packages.values():