Blame SOURCES/0002-rhel-Adjust-8.0-8-unknown-regex.patch

44d9d0
From dba9bae09f0f04aa00418092d5ae6c4a41f981bc Mon Sep 17 00:00:00 2001
44d9d0
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
44d9d0
Date: Tue, 19 Mar 2019 11:16:03 +0100
44d9d0
Subject: [PATCH 2/2] rhel: Adjust 8.0/8-unknown regex
44d9d0
MIME-Version: 1.0
44d9d0
Content-Type: text/plain; charset=UTF-8
44d9d0
Content-Transfer-Encoding: 8bit
44d9d0
44d9d0
By doing this, 8.0.x can also be matched as 8.0.
44d9d0
44d9d0
Signed-off-by: Fabiano FidĂȘncio <fidencio@redhat.com>
44d9d0
---
44d9d0
 os/redhat.com/rhel-8-unknown.xml | 16 ++++++++--------
44d9d0
 os/redhat.com/rhel-8.0.xml       | 20 ++++++++++----------
44d9d0
 2 files changed, 18 insertions(+), 18 deletions(-)
44d9d0
44d9d0
diff --git a/os/redhat.com/rhel-8-unknown.xml b/os/redhat.com/rhel-8-unknown.xml
44d9d0
index 5026cd2..226a018 100644
44d9d0
--- a/os/redhat.com/rhel-8-unknown.xml
44d9d0
+++ b/os/redhat.com/rhel-8-unknown.xml
44d9d0
@@ -25,7 +25,7 @@
44d9d0
     <media arch="x86_64">
44d9d0
       <iso>
44d9d0
         <system-id>LINUX</system-id>
44d9d0
-        <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>
44d9d0
+        <volume-id>.*RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*x86_64.*</volume-id>
44d9d0
       </iso>
44d9d0
       <kernel>isolinux/vmlinuz</kernel>
44d9d0
       <initrd>isolinux/initrd.img</initrd>
44d9d0
@@ -34,28 +34,28 @@
44d9d0
     <media arch="aarch64">
44d9d0
        <iso>
44d9d0
          <system-id>LINUX</system-id>
44d9d0
-         <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>
44d9d0
+         <volume-id>RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*aarch64$</volume-id>
44d9d0
        </iso>
44d9d0
      </media>
44d9d0
 
44d9d0
     <media arch="ppc64le">
44d9d0
        <iso>
44d9d0
          <system-id>PPC</system-id>
44d9d0
-         <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>
44d9d0
+         <volume-id>RHEL[_-]8[_-]([1-9]|[1-9][0-9])([_-]([0-9]|[1-9][0-9]))?.*ppc64le$</volume-id>
44d9d0
        </iso>
44d9d0
      </media>
44d9d0
 
44d9d0
     <media arch="s390x">
44d9d0
        <iso>
44d9d0
          <system-id>LINUX</system-id>
44d9d0
-         <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>
44d9d0
+         <volume-id>RHEL-8-([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?.*s390x$</volume-id>
44d9d0
        </iso>
44d9d0
      </media>
44d9d0
 
44d9d0
     <tree arch="aarch64">
44d9d0
       <treeinfo>
44d9d0
         <family>Red Hat Enterprise Linux</family>
44d9d0
-        <version>^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$</version>
44d9d0
+        <version>^8.([1-9]|[1-9][0-9])(-[0-9]|[1-9][0-9])?$</version>
44d9d0
         <arch>aarch64</arch>
44d9d0
       </treeinfo>
44d9d0
     </tree>
44d9d0
@@ -63,7 +63,7 @@
44d9d0
     <tree arch="ppc64le">
44d9d0
       <treeinfo>
44d9d0
         <family>Red Hat Enterprise Linux</family>
44d9d0
-        <version>^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$</version>
44d9d0
+        <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
44d9d0
         <arch>ppc64le</arch>
44d9d0
       </treeinfo>
44d9d0
     </tree>
44d9d0
@@ -71,7 +71,7 @@
44d9d0
     <tree arch="s390x">
44d9d0
       <treeinfo>
44d9d0
         <family>Red Hat Enterprise Linux</family>
44d9d0
-        <version>^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$</version>
44d9d0
+        <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
44d9d0
         <arch>s390x</arch>
44d9d0
       </treeinfo>
44d9d0
     </tree>
44d9d0
@@ -79,7 +79,7 @@
44d9d0
     <tree arch="x86_64">
44d9d0
       <treeinfo>
44d9d0
         <family>Red Hat Enterprise Linux</family>
44d9d0
-        <version>^8.(([1-9]|[1-9][0-9])|(([0-9]|[1-9][0-9]).([0-9]|[1-9][0-9])))$</version>
44d9d0
+        <version>^8.([1-9]|[1-9][0-9])(.([0-9]|[1-9][0-9]))?$</version>
44d9d0
         <arch>x86_64</arch>
44d9d0
       </treeinfo>
44d9d0
     </tree>
44d9d0
diff --git a/os/redhat.com/rhel-8.0.xml b/os/redhat.com/rhel-8.0.xml
44d9d0
index 3db4aff..20e80d0 100644
44d9d0
--- a/os/redhat.com/rhel-8.0.xml
44d9d0
+++ b/os/redhat.com/rhel-8.0.xml
44d9d0
@@ -49,7 +49,7 @@
44d9d0
     <media arch="x86_64">
44d9d0
       <iso>
44d9d0
         <system-id>LINUX</system-id>
44d9d0
-        <volume-id>RHEL-8-0-BaseOS-x86_64</volume-id>
44d9d0
+        <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-x86_64</volume-id>
44d9d0
       </iso>
44d9d0
       <kernel>isolinux/vmlinuz</kernel>
44d9d0
       <initrd>isolinux/initrd.img</initrd>
44d9d0
@@ -58,7 +58,7 @@
44d9d0
     <media arch="ppc64le">
44d9d0
       <iso>
44d9d0
         <system-id>PPC</system-id>
44d9d0
-        <volume-id>RHEL[_-]8[_-]0[_-]BaseOS[_-]ppc64le</volume-id>
44d9d0
+        <volume-id>RHEL[_-]8[_-]0[_-](([0-9]|[1-9][0-9])[_-])?BaseOS[_-]ppc64le</volume-id>
44d9d0
       </iso>
44d9d0
       <kernel>ppc/ppc64/vmlinuz</kernel>
44d9d0
       <initrd>ppc/ppc64/initrd.img</initrd>
44d9d0
@@ -67,21 +67,21 @@
44d9d0
     <media arch="aarch64">
44d9d0
       <iso>
44d9d0
         <system-id>LINUX</system-id>
44d9d0
-        <volume-id>RHEL-8-0-BaseOS-aarch64</volume-id>
44d9d0
+        <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-aarch64</volume-id>
44d9d0
       </iso>
44d9d0
     </media>
44d9d0
 
44d9d0
     <media arch="s390x">
44d9d0
       <iso>
44d9d0
         <system-id>LINUX</system-id>
44d9d0
-        <volume-id>RHEL-8-0-BaseOS-s390x</volume-id>
44d9d0
+        <volume-id>RHEL-8-0-(([0-9]|[1-9][0-9])-)?BaseOS-s390x</volume-id>
44d9d0
       </iso>
44d9d0
     </media>
44d9d0
 
44d9d0
     <tree arch="aarch64">
44d9d0
       <treeinfo>
44d9d0
         <family>Red Hat Enterprise Linux</family>
44d9d0
-        <version>8.0$</version>
44d9d0
+        <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
44d9d0
         <arch>aarch64</arch>
44d9d0
       </treeinfo>
44d9d0
     </tree>
44d9d0
@@ -89,7 +89,7 @@
44d9d0
     <tree arch="ppc64le">
44d9d0
       <treeinfo>
44d9d0
         <family>Red Hat Enterprise Linux</family>
44d9d0
-        <version>^8.0$</version>
44d9d0
+        <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
44d9d0
         <arch>ppc64le</arch>
44d9d0
       </treeinfo>
44d9d0
     </tree>
44d9d0
@@ -97,7 +97,7 @@
44d9d0
     <tree arch="s390x">
44d9d0
       <treeinfo>
44d9d0
         <family>Red Hat Enterprise Linux</family>
44d9d0
-        <version>^8.0$</version>
44d9d0
+        <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
44d9d0
         <arch>s390x</arch>
44d9d0
       </treeinfo>
44d9d0
     </tree>
44d9d0
@@ -105,7 +105,7 @@
44d9d0
     <tree arch="x86_64">
44d9d0
       <treeinfo>
44d9d0
         <family>Red Hat Enterprise Linux</family>
44d9d0
-        <version>^8.0$</version>
44d9d0
+        <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
44d9d0
         <arch>x86_64</arch>
44d9d0
       </treeinfo>
44d9d0
     </tree>
44d9d0
@@ -113,7 +113,7 @@
44d9d0
     <tree arch="aarch64">
44d9d0
       <treeinfo>
44d9d0
         <family>Red Hat Enterprise Linux</family>
44d9d0
-        <version>^8.0$</version>
44d9d0
+        <version>^8.0(.([0-9]|[1-9][0-9]))?$</version>
44d9d0
         <arch>aarch64</arch>
44d9d0
       </treeinfo>
44d9d0
     </tree>
44d9d0
@@ -148,4 +148,4 @@
44d9d0
       </recommended>
44d9d0
     </resources>
44d9d0
   </os>
44d9d0
-</libosinfo>
44d9d0
\ No newline at end of file
44d9d0
+</libosinfo>
44d9d0
-- 
44d9d0
2.20.1
44d9d0