diff options
| author | Friedemann Kleint <[email protected]> | 2010-06-15 12:17:09 +0200 |
|---|---|---|
| committer | Friedemann Kleint <[email protected]> | 2010-06-15 12:17:09 +0200 |
| commit | 59592c820cdd8b15d625bb9d9f6ef5348b7e68d5 (patch) | |
| tree | e734371a8ca2658a5ffb83a84556a7e72251ecae /src/plugins/vcsbase/vcsbaseplugin.cpp | |
| parent | ff7c543a736a23321f91a5dde9c74b9545e4302f (diff) | |
VCS: Do not force LANG=C on all commands.
Introduce extra flag.
Task-number: QTCREATORBUG-1623
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseplugin.cpp')
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseplugin.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 957395c0074..ab5e3fefd1c 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -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) |