diff --git a/src/apple.py b/src/apple.py index c2db4d8e..fd1c822b 100644 --- a/src/apple.py +++ b/src/apple.py @@ -74,10 +74,11 @@ for product_name in VERSION_PATTERNS: date_str = date_match.group(0).replace("Sept ", "Sep ") date = dates.parse_date(date_str) for version_pattern in VERSION_PATTERNS[product.name]: - for version in version_pattern.findall(version_text): - if not product.has_version(version) or product.get_version(version).date() > date: - product.declare_version(version, date) + for version_str in version_pattern.findall(version_text): + version = product.get_version(version_str) + if not version or version.date() > date: + product.declare_version(version_str, date) else: - logging.info(f"ignoring version {version} ({date}) for {product.name}") + logging.info(f"ignoring version {version_str} ({date}) for {product.name}") product.write() diff --git a/src/common/releasedata.py b/src/common/releasedata.py index 4f28a411..19d24ff2 100644 --- a/src/common/releasedata.py +++ b/src/common/releasedata.py @@ -57,9 +57,6 @@ class Product: return product - def has_version(self, version: str) -> bool: - return version in self.versions - def get_version(self, version: str) -> ProductVersion: return self.versions[version] if version in self.versions else None @@ -76,7 +73,7 @@ class Product: self.declare_version(version, date) def remove_version(self, version: str) -> None: - if not self.has_version(version): + if not self.get_version(version): logging.warning(f"version {version} cannot be removed as it does not exist for {self}") return