diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2020-05-04 13:03:37 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2020-05-06 09:12:37 +0300 |
| commit | dc9b19cd649ce10bcd3296cb3198c3ea758bd8ec (patch) | |
| tree | a7b749e26859578e18d300e677f1366ecf105b45 | |
| parent | 7c4403a17e3ee4d84444b1d8c7edb3ac84c9ae80 (diff) | |
Fix addElevatedOperation prevents installing from CLI
Reorder the checking of if we are already running the binary with
sufficient rights to happen before intentionally failing gaining
on-demand admin rights with command line instance.
Task-number: QTIFW-1700
Change-Id: I7cbce535baa1a818ee0fa263fa0dfc7af75c59d4
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index db144806f..14d7114f6 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -2353,14 +2353,13 @@ Settings &PackageManagerCore::settings() const */ bool PackageManagerCore::gainAdminRights() { + if (AdminAuthorization::hasAdminRights()) + return true; + if (isCommandLineInstance()) { throw Error(tr("Cannot elevate access rights while running from command line. " "Please restart the application as administrator.")); } - - if (AdminAuthorization::hasAdminRights()) - return true; - RemoteClient::instance().setActive(true); if (!RemoteClient::instance().isActive()) throw Error(tr("Error while elevating access rights.")); |