[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libosinfo] [osinfo-db PATCH v2 24/25] rhel-8-unknown: Adjust the regex for the volume id



Currently our regex consider cases as 8-x with x > 0.

Although the case shown above has still to be considered, we also have
to consider: 8-x-y, with x >= 0 and y >= 0.

Signed-off-by: Fabiano Fidêncio <fidencio redhat com>
---
 data/os/redhat.com/rhel-8-unknown.xml.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/os/redhat.com/rhel-8-unknown.xml.in b/data/os/redhat.com/rhel-8-unknown.xml.in
index 7367038..8882940 100644
--- a/data/os/redhat.com/rhel-8-unknown.xml.in
+++ b/data/os/redhat.com/rhel-8-unknown.xml.in
@@ -15,7 +15,7 @@
     <media arch="x86_64">
       <iso>
         <system-id>LINUX</system-id>
-        <volume-id>.*RHEL-8-([1-9]|[1-9][0-9]).*x86_64.*</volume-id>
+        <volume-id>.*RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*x86_64.*</volume-id>
       </iso>
       <kernel>isolinux/vmlinuz</kernel>
       <initrd>isolinux/initrd.img</initrd>
@@ -24,21 +24,21 @@
     <media arch="aarch64">
        <iso>
          <system-id>LINUX</system-id>
-         <volume-id>RHEL-8-([1-9]|[1-9][0-9]).*aarch64$</volume-id>
+         <volume-id>RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*aarch64$</volume-id>
        </iso>
      </media>
 
     <media arch="ppc64le">
        <iso>
          <system-id>PPC</system-id>
-         <volume-id>RHEL[_-]8[_-]([1-9]|[1-9][0-9]).*ppc64le$</volume-id>
+         <volume-id>RHEL[_-]8[_-](([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])[_-]([0-9]|[1-9][0-9]))).*ppc64le$</volume-id>
        </iso>
      </media>
 
     <media arch="s390x">
        <iso>
          <system-id>LINUX</system-id>
-         <volume-id>RHEL-8-([1-9]|[1-9][0-9]).*s390x$</volume-id>
+         <volume-id>RHEL-8-(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9])-([0-9]|[1-9][0-9]))).*s390x$</volume-id>
        </iso>
      </media>
 
-- 
2.20.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]