summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-07 13:13:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-07 13:13:00 +0100
commitea6bb12bb1b94bcbdaf67a5e4f0c7d659fe94188 (patch)
tree05488f7f497aac672a016263c1f1d418cf198b74 /desktop
parentb57d06315175c7aabfde6c02ee4f122cfbef10e8 (diff)
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
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index faf2ba398729..80ed1bcec910 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");