From 21f70e9ba66ba0ad6c0fcb154be1736b83a1230b Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 12 Apr 2024 01:38:10 +0200 Subject: [PATCH] pmb.build.is_necessary: tweak comments (MR 2295) * Remove obvious / not helpful line: "# Get package name, version, define start of debug message" * Remove "old" in "Get old version from APKINDEX" because it may be newer than the version in pmaports * Replace "Aports [folder]" with pmaports (in some parts of pmbootstrap code, pmaports is still referred to as aports, this was one of them) --- pmb/build/other.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pmb/build/other.py b/pmb/build/other.py index 44d00e32..28028610 100644 --- a/pmb/build/other.py +++ b/pmb/build/other.py @@ -52,12 +52,11 @@ def is_necessary(args, arch, apkbuild, indexes=None): :param indexes: list of APKINDEX.tar.gz paths :returns: boolean """ - # Get package name, version, define start of debug message package = apkbuild["pkgname"] version_pmaports = apkbuild["pkgver"] + "-r" + apkbuild["pkgrel"] msg = "Build is necessary for package '" + package + "': " - # Get old version from APKINDEX + # Get version from APKINDEX index_data = pmb.parse.apkindex.package(args, package, arch, False, indexes) if not index_data: @@ -82,13 +81,13 @@ def is_necessary(args, arch, apkbuild, indexes=None): version_binary, package)) return False - # b) Aports folder has a newer version + # b) Local pmaports has a newer version if version_pmaports != version_binary: logging.debug(f"{msg}Binary package out of date (binary: " f"{version_binary}, aport: {version_pmaports})") return True - # Aports and binary repo have the same version. + # Local pmaports and binary repo have the same version return False