From 54fc2533c8fccc665f9d851e5adf83361b3ff6d2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 10 Nov 2022 10:56:03 +0100 Subject: [PATCH] simplify cpuset regex Signed-off-by: Wolfgang Bumiller --- src/Utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Utils.js b/src/Utils.js index 87afbea..e9b84f8 100644 --- a/src/Utils.js +++ b/src/Utils.js @@ -1315,7 +1315,7 @@ utilities: { me.DnsName_match = new RegExp("^" + DnsName_REGEXP + "$"); me.DnsName_or_Wildcard_match = new RegExp("^(?:\\*\\.)?" + DnsName_REGEXP + "$"); - me.CpuSet_match = /^(?:(?:[0-9]+,)|(?:[0-9]+-[0-9]+,))*(?:(?:[0-9]+)$|(?:[0-9]+-[0-9]+)$)/; + me.CpuSet_match = /^[0-9]+(?:-[0-9]+)?(?:,[0-9]+(?:-[0-9]+)?)*$/; me.HostPort_match = new RegExp("^(" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")(?::(\\d+))?$"); me.HostPortBrackets_match = new RegExp("^\\[(" + IPV6_REGEXP + "|" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")\\](?::(\\d+))?$");