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

ShellCommand: De-virtualize environment()

Browse Source 
Provide instead a protected setter, used in VcsCommand c'tor.

Remove a forceCLocale arg from setProcessEnvironment() method,
as it is used only in VcsCommand context when
ShellCommand::ForceCLocale flag was set. Move setting
C locale env directly to the shell command, just before
the command is executed, so that we are sure the flag
was already set.

Modify env directly in VcsCommand c'tor with regards to
SSH_ASKPASS variable.

Change-Id: Icff555ade4984368f7ce79f762d1bb5d3614076a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-07-13 17:54:59 +02:00
parent 68bb3b99a9
commit 85071d8e8d
7 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/utils/shellcommand.cpp
View File

@@ -79,9 +79,19 @@ public:
~ShellCommandPrivate() { delete m_progressParser; }
Environment environment()
{
if (!(m_flags & ShellCommand::ForceCLocale))
return m_environment;
m_environment.set("LANG", "C");
m_environment.set("LANGUAGE", "C");
return m_environment;
}
QString m_displayName;
const FilePath m_defaultWorkingDirectory;
const Environment m_environment;
Environment m_environment;
QVariant m_cookie;
QTextCodec *m_codec = nullptr;
ProgressParser *m_progressParser = nullptr;
@@ -152,9 +162,9 @@ const FilePath &ShellCommand::defaultWorkingDirectory() const
return d->m_defaultWorkingDirectory;
}
Environment ShellCommand::environment() const
void ShellCommand::setEnvironment(const Environment &env)
{
return d->m_environment;
d->m_environment = env;
}
int ShellCommand::defaultTimeoutS() const
@@ -310,7 +320,7 @@ void ShellCommand::runCommand(QtcProcess &proc,
proc.setCommand(command);
if (d->m_disableUnixTerminal)
proc.setDisableUnixTerminal();
proc.setEnvironment(environment());
proc.setEnvironment(d->environment());
if (d->m_flags & MergeOutputChannels)
proc.setProcessChannelMode(QProcess::MergedChannels);
if (d->m_codec)