[Libosinfo] [PATCH] win7: Put pro n sp1 regex under correct architecture

[Christophe Fergeau]

----- Mail original -----
> In commit 39f22d2 (win7: Generalize volume-id for professional), I
> generalized the regex of windows 7 professional to include N SP1 but I
> ended up adding the regex for both i386 and x86_64 architectures under
> i386.
> 
> This patch fixes that.
> ---
>  data/oses/windows.xml.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
> index 19dc349..ccafaeb 100644
> --- a/data/oses/windows.xml.in
> +++ b/data/oses/windows.xml.in
> @@ -769,7 +769,7 @@
>      <media arch="i686" installer-reboots="2">
>        <variant id="professional"/>
>        <iso>
> -
> <volume-id>(GSP1RMCNPRFRER|GSP1RMCN*PRX*FRER|GSP1RMCPRVOL)_</volume-id>
> +

Aren't the 1st and 2nd regex redundant?

> <volume-id>(GSP1RMCNPRFRER|GSP1RMCN?PRFRER|GSP1RMCPRVOL)_</volume-id>
>          <publisher-id>MICROSOFT CORPORATION</publisher-id>
>          <l10n-language regex="true"
>          l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
>        </iso>
> @@ -777,7 +777,7 @@
>      <media arch="x86_64" installer-reboots="2">
>        <variant id="professional"/>
>        <iso>
> -        <volume-id>(GSP1RMCPRXFRER|GSP1RMCPRXVOL)_</volume-id>
> +
> <volume-id>(GSP1RMCPRXFRER|GSP1RMCN?PRXFRER|GSP1RMCPRXVOL)_</volume-id>

Ditto here.

Christophe