[openwrt/openwrt] scripts: add missing regex for dl_cleanup script

LEDE Commits lede-commits at lists.infradead.org
Wed Sep 22 22:53:22 PDT 2021


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/4eb4c3c469a7b38266957d8a14d27e894e4da494

commit 4eb4c3c469a7b38266957d8a14d27e894e4da494
Author: Ansuel Smith <ansuelsmth at gmail.com>
AuthorDate: Tue Jul 6 00:56:21 2021 +0200

    scripts: add missing regex for dl_cleanup script
    
    Regex xxx-YYYY-MM-DD-GIT_SHASUM was missing. Add the new regex to improve
    and better find outdated package. This also fix a bug where some bug were
    incorrectly detected as packagename-yyyy-mm-dd instead of packagename due
    to them be parsed by the wrong parser
    
    Example:
    
        openwrt-keyring-2021-02-20-49283916.tar.xz
    
    Signed-off-by: Ansuel Smith <ansuelsmth at gmail.com>
    [added example in commit message]
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 scripts/dl_cleanup.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/dl_cleanup.py b/scripts/dl_cleanup.py
index 1acb049582..83269e68e5 100755
--- a/scripts/dl_cleanup.py
+++ b/scripts/dl_cleanup.py
@@ -62,6 +62,13 @@ def parseVer_r(match, filepath):
 	progversion = (int(match.group(2)) << 64)
 	return (progname, progversion)
 
+def parseVer_ymd_GIT_SHASUM(match, filepath):
+	progname = match.group(1)
+	progversion = (int(match.group(2)) << 64) |\
+		      (int(match.group(3)) << 48) |\
+		      (int(match.group(4)) << 32)
+	return (progname, progversion)
+
 def parseVer_ymd(match, filepath):
 	progname = match.group(1)
 	progversion = (int(match.group(2)) << 64) |\
@@ -90,6 +97,7 @@ extensions = (
 
 versionRegex = (
 	(re.compile(r"(.+)[-_](\d+)\.(\d+)\.(\d+)\.(\d+)"), parseVer_1234),	# xxx-1.2.3.4
+	(re.compile(r"(.+)[-_](\d\d\d\d)-?(\d\d)-?(\d\d)-"), parseVer_ymd_GIT_SHASUM),	# xxx-YYYY-MM-DD-GIT_SHASUM
 	(re.compile(r"(.+)[-_](\d\d\d\d)-?(\d\d)-?(\d\d)"), parseVer_ymd),	# xxx-YYYY-MM-DD
 	(re.compile(r"(.+)[-_]([0-9a-fA-F]{40,40})"), parseVer_GIT),		# xxx-GIT_SHASUM
 	(re.compile(r"(.+)[-_](\d+)\.(\d+)\.(\d+)(\w?)"), parseVer_123),	# xxx-1.2.3a



More information about the lede-commits mailing list