[Libosinfo] [osinfo-db] fedora-unknown: Adjust the regular expression

Fabiano Fidêncio fidencio at redhat.com
Mon Mar 19 19:40:54 UTC 2018


From: Fabiano Fidêncio <fabiano at fidencio.org>

Currently Fedora ISOs have the following volume-id:
Alpha/Beta:
- Workstation: Fedora-WS-dvd-x86_64-28
- Server: Fedora-S-dvd-x86_64-28
- Live: Fedora-WS-Live-28-20180318-n-0
Rawhide:
- Workstation: Fedora-WS-dvd-x86_64-rawh
- Server: Fedora-S-dvd-x86_64-rawh
- Live: Fedora-WS-Live-Rawhide-20180318-

As the latest released version is Fedora27, let's adjust our RE to
match:
Installation ISO:
Fedora-.*-dvd-x86_64-(2[8-9]|[3-9][0-9]|rawh)
       |              ------ ---------- ----
       v                |        |       |
   WS|S|WSOstree        |        |       |
                        v        |       |
                     28, 29      |       |
                                 v       |
                             30 ... 99   |
                                         v
                                      rawhide

Live ISO:
Fedora-.*-Live-(2[8-9]|[3-9][0-9]|Rawhide).*
       |        ------ ---------- -------  |
       v          |        |         |     |
 WS|S|WSOstree    |        |         |     |
                  v        |         |     |
               28, 29      |         |     |
                           v         |     |
                       30 ... 99     |     |
                                     v     |
                                  rawhide  |
                                           v
                                         -, -n-d

Signed-off-by: Fabiano Fidêncio <fabiano at fidencio.org>
---
 data/os/fedoraproject.org/fedora-unknown.xml.in | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/data/os/fedoraproject.org/fedora-unknown.xml.in b/data/os/fedoraproject.org/fedora-unknown.xml.in
index 1f513ec..704829b 100644
--- a/data/os/fedoraproject.org/fedora-unknown.xml.in
+++ b/data/os/fedoraproject.org/fedora-unknown.xml.in
@@ -8,34 +8,22 @@
     <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
-    <upgrades id="http://fedoraproject.org/fedora/24"/>
-    <derives-from id="http://fedoraproject.org/fedora/24"/>
+    <upgrades id="http://fedoraproject.org/fedora/27"/>
+    <derives-from id="http://fedoraproject.org/fedora/27"/>
     <release-status>prerelease</release-status>
 
-    <media arch="i686">
-      <iso>
-        <volume-id>Fedora.*-([2-9][5-9]|[0-9]{3,}).*-i386</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-    </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>Fedora.*-([2-9][5-9]|[0-9]{3,}).*-x86_64</volume-id>
+        <volume-id>Fedora-.*-dvd-x86_64-(2[8-9]|[3-9][0-9]|rawh)</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>isolinux/vmlinuz</kernel>
       <initrd>isolinux/initrd.img</initrd>
     </media>
 
-    <media arch="i686" live="true">
-      <iso>
-        <volume-id>Fedora-Live-.*-i686-([2-9][5-9]|[0-9]{3,})</volume-id>
-        <system-id>LINUX</system-id>
-      </iso>
-    </media>
     <media arch="x86_64" live="true">
       <iso>
-        <volume-id>Fedora-Live-.*-x86_64-([2-9][5-9]|[0-9]{3,})</volume-id>
+        <volume-id>Fedora-.*-Live-(2[8-9]|[3-9][0-9]|Rawhide).*</volume-id>
         <system-id>LINUX</system-id>
       </iso>
     </media>
-- 
2.14.3




More information about the Libosinfo mailing list