Allow hyphen in package names.

jfpanisset · jfpanisset · commit 5d27b6f4e4f6 · 2025-04-22T13:08:06.000-07:00
Hyphens (as well as dots and plus but we don't use those) are
allowed as Conan package names, so we must allow them in aswfdocker.

Signed-off-by: Jean-Francois Panisset &lt;panisset@gmail.com&gt;
diff --git a/python/aswfdocker/constants.py b/python/aswfdocker/constants.py
@@ -28,7 +28,7 @@ class ImageType(enum.Enum):
 )
 
 # pylint: disable=line-too-long
-IMAGE_NAME_REGEX = r"(refs/tags/)?(?P<org>[a-z]+)/ci-(?P<package>package\-)?(?P<image>[a-z0-9_]+)[:/](?P<version>[0-9\.a-z\-]+)"
+IMAGE_NAME_REGEX = r"(refs/tags/)?(?P<org>[a-z]+)/ci-(?P<package>package\-)?(?P<image>[a-z0-9_-]+)[:/](?P<version>[0-9\.a-z\-]+)"
 
 ALL = "all"
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class ImageType(enum.Enum):`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`# pylint: disable=line-too-long`
`31`		`-IMAGE_NAME_REGEX = r"(refs/tags/)?(?P<org>[a-z]+)/ci-(?P<package>package\-)?(?P<image>[a-z0-9_]+)[:/](?P<version>[0-9\.a-z\-]+)"`
	`31`	`+IMAGE_NAME_REGEX = r"(refs/tags/)?(?P<org>[a-z]+)/ci-(?P<package>package\-)?(?P<image>[a-z0-9_-]+)[:/](?P<version>[0-9\.a-z\-]+)"`
`32`	`32`
`33`	`33`	`ALL = "all"`
`34`	`34`