[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cli_ure/source

[Michael Stahl]

 cli_ure/source/climaker/climaker_app.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d0d03f22ef5eddb7036867205577d488b1af7528
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 6 21:10:27 2015 +0200

    cli_ure: climaker should open keyfile read-only
    
    This should fix build failures due to file locking preventing concurrent
    access to cli_ure/source/cliuno.snk.
    
    Change-Id: Iefd16ed83a01523b3612844c2f777516dc4e44c6
    (cherry picked from commit 01518d3aa09ad8cb2cb82dcb329aeaab96c95bce)
    Reviewed-on: https://gerrit.libreoffice.org/19483
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx
index efff92d..9719182 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -462,7 +462,8 @@ SAL_IMPLEMENT_MAIN()
             ::System::String ^ sKeyFile = ustring_to_String(keyfile);
             try {
                 System::IO::FileStream^ fs = gcnew System::IO::FileStream(
-                    sKeyFile, System::IO::FileMode::Open);
+                    sKeyFile, System::IO::FileMode::Open,
+                    System::IO::FileAccess::Read, System::IO::FileShare::Read);
                 kp = gcnew StrongNameKeyPair(fs);
                 fs->Close();
             }