[openwrt/openwrt] scripts: add additional regex for dl_cleanup

LEDE Commits lede-commits at lists.infradead.org
Tue Sep 13 16:34:51 PDT 2022


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/428c5bf3d1b8a245d1fc3e8be6e23058c59aba8c

commit 428c5bf3d1b8a245d1fc3e8be6e23058c59aba8c
Author: Ansuel Smith <ansuelsmth at gmail.com>
AuthorDate: Thu Mar 31 21:15:51 2022 +0200

    scripts: add additional regex for dl_cleanup
    
    Add additional regex for dl_cleanup script to handle
    case with xxx-v1.2a and xxx-v1.2.3a
    
    Signed-off-by: Ansuel Smith <ansuelsmth at gmail.com>
---
 scripts/dl_cleanup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/dl_cleanup.py b/scripts/dl_cleanup.py
index ad1b88c8b9..d22762136a 100755
--- a/scripts/dl_cleanup.py
+++ b/scripts/dl_cleanup.py
@@ -119,8 +119,10 @@ versionRegex = (
     (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
+    (re.compile(r"(.+)[-_]v(\d+)\.(\d+)\.(\d+)(\w?)"), parseVer_123),  # xxx-v1.2.3a
     (re.compile(r"(.+)[-_](\d+)_(\d+)_(\d+)"), parseVer_123),  # xxx-1_2_3
     (re.compile(r"(.+)[-_](\d+)\.(\d+)(\w?)"), parseVer_12),  # xxx-1.2a
+    (re.compile(r"(.+)[-_]v(\d+)\.(\d+)(\w?)"), parseVer_12),  # xxx-v1.2a
     (re.compile(r"(.+)[-_]r?(\d+)"), parseVer_r),  # xxx-r1111
 )
 




More information about the lede-commits mailing list