feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: create provideAskPassEntry(Environment &) convenience

Browse Source 
... to centrally set SUDO_ASKPASS unless present.

To be used for 'Run as root'

Change-Id: I85bac939e6a7fba0b2299fd17edfe73577bfa5ad
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-02-16 12:42:59 +01:00
parent 166fce5036
commit 2845427d46
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -50,6 +50,8 @@
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <ssh/sshsettings.h>
#include <QDir> #include <QDir>
#include <QFormLayout> #include <QFormLayout>
#include <QHash> #include <QHash>
@@ -1067,6 +1069,15 @@ bool RunControl::showPromptToStopDialog(const QString &title,
return close; return close;
} }
void RunControl::provideAskPassEntry(Environment &env)
{
if (env.value("SUDO_ASKPASS").isEmpty()) {
const FilePath askpass = QSsh::SshSettings::askpassFilePath();
if (askpass.exists())
env.set("SUDO_ASKPASS", askpass.toUserOutput());
}
}
bool RunControlPrivate::isAllowedTransition(RunControlState from, RunControlState to) bool RunControlPrivate::isAllowedTransition(RunControlState from, RunControlState to)
{ {
switch (from) { switch (from) {

2
src/plugins/projectexplorer/runcontrol.h
View File

@@ -250,6 +250,8 @@ public:
const QString &cancelButtonText = QString(), const QString &cancelButtonText = QString(),
bool *prompt = nullptr); bool *prompt = nullptr);
static void provideAskPassEntry(Utils::Environment &env);
RunWorker *createWorker(Utils::Id workerId); RunWorker *createWorker(Utils::Id workerId);
bool createMainWorker(); bool createMainWorker();