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

VCS: Do not force LANG=C on all commands.

Browse Source 
Introduce extra flag.

Task-number: QTCREATORBUG-1623
This commit is contained in:
Friedemann Kleint
2010-06-15 12:17:09 +02:00
parent ff7c543a73
commit 59592c820c
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -686,9 +686,10 @@ bool VCSBasePlugin::isSshPromptConfigured()
return !sshPrompt().isEmpty();
}
void VCSBasePlugin::setProcessEnvironment(QProcessEnvironment *e)
void VCSBasePlugin::setProcessEnvironment(QProcessEnvironment *e, bool forceCLocale)
{
e->insert(QLatin1String("LANG"), QString(QLatin1Char('C')));
if (forceCLocale)
e->insert(QLatin1String("LANG"), QString(QLatin1Char('C')));
const QString sshPromptBinary = sshPrompt();
if (!sshPromptBinary.isEmpty())
e->insert(QLatin1String("SSH_ASKPASS"), sshPromptBinary);
@@ -738,6 +739,8 @@ Utils::SynchronousProcessResponse
nsp << "ssh (" << sshPromptConfigured << ')';
if (flags & SuppressCommandLogging)
nsp << "suppress_log";
if (flags & ForceCLocale)
nsp << "c_locale";
if (outputCodec)
nsp << " Codec: " << outputCodec->name();
}
@@ -747,7 +750,7 @@ Utils::SynchronousProcessResponse
if (!workingDir.isEmpty())
process.setWorkingDirectory(workingDir);
VCSBase::VCSBasePlugin::setProcessEnvironment(&env);
VCSBase::VCSBasePlugin::setProcessEnvironment(&env, (flags & ForceCLocale));
process.setProcessEnvironment(env);
process.setTimeout(timeOutMS);
if (outputCodec)