Re: [PATCH 1/2] win, installer: Fix misplaced parenthesis

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

 



On Fri, May 13, 2016 at 9:58 AM, Christophe Fergeau <cfergeau@xxxxxxxxxx> wrote:
>
> Acked-by: Christophe Fergeau <cfergeau@xxxxxxxxxx>

Pushed, thanks!

>
> On Thu, May 12, 2016 at 11:01:24PM +0200, Fabiano Fidêncio wrote:
>> The commit 17809d54 inserted a wrong parenthesis in the test done for
>> skipping the ProductKey during the WindowsPE phase of the script.
>>
>> In this patch, the bogus expression "count(media/variant != 0)" is
>> replaced by "count(media/variant) != 0".
>>
>> Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
>> ---
>>  data/install-script/microsoft.com/windows-unattend-desktop.xml.in | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
>> index 3d58a88..e91b230 100644
>> --- a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
>> +++ b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
>> @@ -152,7 +152,7 @@
>>            <xsl:choose>
>>              <xsl:when test="os/version = 6.2 or os/version = 6.3"> <!-- Windwos 8 and Windows 8.1 -->
>>                <xsl:choose>
>> -                <xsl:when test="count(media/variant != 0) and (contains(media/variant, 'enterprise') or contains(media/variant, 'professional'))">
>> +                <xsl:when test="count(media/variant) != 0 and (contains(media/variant, 'enterprise') or contains(media/variant, 'professional'))">
>>                    <!-- Skip the ProductKey during this phase of the script for the following variants: Enterprise, Enterprise Debug and Professional -->
>>                  </xsl:when>
>>                  <xsl:otherwise>
>> --
>> 2.7.4
>>
>> _______________________________________________
>> Libosinfo mailing list
>> Libosinfo@xxxxxxxxxx
>> https://www.redhat.com/mailman/listinfo/libosinfo

_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Fedora Users]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux