[Libreoffice-commits] core.git: desktop/source

[Stephan Bergmann]

 desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit ea6bb12bb1b94bcbdaf67a5e4f0c7d659fe94188
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 7 13:13:00 2017 +0100

    bLicenseException is always false
    
    ...ever since 3c289e248a4f7c6940bb7429ee70d17a6196016c "jl152 import 263446 from
    native0jl:#i77196# supporting licenses, suppress license switch, subsequent
    accepting of licenses for bundled/shared extensions"
    
    Change-Id: I138016f6c83de8a7e085d4191ee06e0a1232203c

diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index faf2ba3..80ed1bc 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -219,7 +219,6 @@ void CommandEnvironmentImpl::handle(
     deployment::VersionException verExc;
 
 
-    bool bLicenseException = false;
     if (request >>= wtExc) {
         // ignore intermediate errors of legacy packages, i.e.
         // former pkgchk behaviour:
@@ -282,9 +281,7 @@ void CommandEnvironmentImpl::handle(
             return; // unknown request => no selection at all
     }
 
-    //In case of a user declining a license abort is true but this is intended,
-    //therefore no logging
-    if (abort && m_option_verbose && !bLicenseException)
+    if (abort && m_option_verbose)
     {
         OUString msg = ::comphelper::anyToString(request);
         dp_misc::writeConsoleError("\nERROR: " + msg + "\n");