[Libosinfo] [osinfo-db PATCH 2/2] win10: Anchor some volume-ids

Fabiano Fidêncio fidencio at redhat.com
Thu Oct 4 10:51:19 UTC 2018


Let's explicitly anchor the beginning of some volume-ids as they can
cause a wrong match with some win-8 volume ids.

Example:
"(J_)?CENN?A_X64FREV" (win-10) can be taken as a match for
"HRM_CENNA_X64FREV" (win-8).

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

diff --git a/data/os/microsoft.com/win-10.xml.in b/data/os/microsoft.com/win-10.xml.in
index c5da3e8..288bc06 100644
--- a/data/os/microsoft.com/win-10.xml.in
+++ b/data/os/microsoft.com/win-10.xml.in
@@ -48,7 +48,7 @@
     <media arch="i686">
       <variant id="enterprise"/>
       <iso>
-        <volume-id>(J_)?CEN?A_X86FREV_</volume-id>
+        <volume-id>^(J_)?CEN?A_X86FREV_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
@@ -56,7 +56,7 @@
     <media arch="x86_64">
       <variant id="enterprise"/>
       <iso>
-        <volume-id>(J_)?CENN?A_X64FREV_</volume-id>
+        <volume-id>^(J_)?CENN?A_X64FREV_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
@@ -101,14 +101,14 @@
     <!-- No Variant -->
     <media arch="i686">
       <iso>
-        <volume-id>(J_)?CCSN?A_X86FRE_</volume-id>
+        <volume-id>^(J_)?CCSN?A_X86FRE_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
     </media>
     <media arch="x86_64">
       <iso>
-        <volume-id>(J_)?(CCSN?A|C?CCOMA)_X64FREE?_</volume-id>
+        <volume-id>^(J_)?(CCSN?A|C?CCOMA)_X64FREE?_</volume-id>
         <publisher-id>MICROSOFT CORPORATION</publisher-id>
         <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language>
       </iso>
-- 
2.19.0




More information about the Libosinfo mailing list