[lxc-devel] [distrobuilder/master] sources/centos: Fix filename regexes

monstermunchkin on Github lxc-bot at linuxcontainers.org
Thu Jan 16 13:50:26 UTC 2020


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200116/a45df301/attachment.bin>
-------------- next part --------------
From 4b8fc05fe1c5eaf6dee3604bf7698cf053ae4f79 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Thu, 16 Jan 2020 14:49:58 +0100
Subject: [PATCH] sources/centos: Fix filename regexes

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 sources/centos-http.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources/centos-http.go b/sources/centos-http.go
index 0e7cab9..d23bf1c 100644
--- a/sources/centos-http.go
+++ b/sources/centos-http.go
@@ -403,9 +403,9 @@ func (s CentOSHTTP) getRelease(URL, release, variant, arch string) string {
 			re = append(re, fmt.Sprintf("CentOS-Userland-%s-armv7hl-RootFS-(?i:%s)(-\\d+)?-sda.raw.xz",
 				releaseFields[0], variant))
 		} else {
-			re = append(re, fmt.Sprintf("CentOS-%s(.\\d+)?-%s-(?i:%s)(-\\d+)?.iso",
+			re = append(re, fmt.Sprintf("CentOS-%s(.\\d+)*-%s-(?i:%s)(-\\d+)?.iso",
 				releaseFields[0], arch, variant))
-			re = append(re, fmt.Sprintf("CentOS-%s(.\\d+)?-%s(-\\d+)?-(?i:%s).iso",
+			re = append(re, fmt.Sprintf("CentOS-%s(.\\d+)*-%s(-\\d+)?-(?i:%s).iso",
 				releaseFields[0], arch, variant))
 		}
 	}


More information about the lxc-devel mailing list