From aca608d69769da2fd8daeb05aba2aec5218560e5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 23 May 2021 19:57:47 +0200 Subject: [PATCH] Fix detection of mingw repos The code assumed it always started with "mingw" --- app/appstate.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/appstate.py b/app/appstate.py index 5c94e5b..d094f45 100644 --- a/app/appstate.py +++ b/app/appstate.py @@ -256,6 +256,10 @@ class AppState: self._update_etag() +def repo_is_mingw(repo_key: str) -> bool: + return repo_key != "msys" + + class Package: def __init__(self, builddate: str, csize: str, depends: List[str], filename: str, files: List[str], isize: str, @@ -304,14 +308,14 @@ class Package: def realprovides(self) -> Dict[str, Set[str]]: prov = {} for key, infos in self.provides.items(): - if key.startswith("mingw"): + if repo_is_mingw(self.repo) and key.startswith("mingw-w64-"): key = key.split("-", 3)[-1] prov[key] = infos return prov @property def realname(self) -> str: - if self.repo.startswith("mingw"): + if repo_is_mingw(self.repo): return strip_vcs(self.name.split("-", 3)[-1]) return strip_vcs(self.name) @@ -433,7 +437,7 @@ class Source: @property def realname(self) -> str: - if self._package.repo.startswith("mingw"): + if not self._package.repo.startswith("msys"): return strip_vcs(self.name.split("-", 2)[-1]) return strip_vcs(self.name) @@ -483,7 +487,7 @@ class Source: name = d["%NAME%"][0] if "%BASE%" not in d: - if repo.startswith("mingw"): + if repo_is_mingw(repo): base = "mingw-w64-" + name.split("-", 3)[-1] else: base = name