#
#
# patch "src/monotone/MonotoneThread.cpp"
#  from [4ee79106d5f2f66217da9a4fac49a38da6bb3612]
#    to [6194325c884a5f8661944e11cb1815673962089b]
#
============================================================
--- src/monotone/MonotoneThread.cpp	4ee79106d5f2f66217da9a4fac49a38da6bb3612
+++ src/monotone/MonotoneThread.cpp	6194325c884a5f8661944e11cb1815673962089b
@@ -277,11 +277,11 @@ void MonotoneThread::run()
 
     if (!process->waitForStarted())
     {
-        QByteArray stderr = process->readAllStandardError();
+        QByteArray errout = process->readAllStandardError();
         QProcess::ProcessError error = process->error();
 
         cleanup(process);
-        emit aborted(threadNumber, error, QString::fromUtf8(stderr));
+        emit aborted(threadNumber, error, QString::fromUtf8(errout));
         return;
     }
 
@@ -296,11 +296,11 @@ void MonotoneThread::run()
     process->setReadChannel(QProcess::StandardError);
     if (process->waitForReadyRead(1000))
     {
-        QByteArray stderr = process->readAllStandardError();
+        QByteArray errout = process->readAllStandardError();
         QProcess::ProcessError error = process->error();
 
         cleanup(process);
-        emit aborted(threadNumber, error, QString::fromUtf8(stderr));
+        emit aborted(threadNumber, error, QString::fromUtf8(errout));
         return;
     }
     process->setReadChannel(QProcess::StandardOutput);
@@ -358,11 +358,11 @@ void MonotoneThread::run()
 
         if (process->state() != QProcess::Running)
         {
-            QByteArray stderr = process->readAllStandardError();
+            QByteArray errout = process->readAllStandardError();
             QProcess::ProcessError error = process->error();
             
             cleanup(process);
-            emit aborted(threadNumber, error, QString::fromUtf8(stderr));
+            emit aborted(threadNumber, error, QString::fromUtf8(errout));
             return;
         }
 
@@ -414,11 +414,11 @@ void MonotoneThread::run()
         {
             if (process->state() != QProcess::Running)
             {
-                QByteArray stderr = process->readAllStandardError();
+                QByteArray errout = process->readAllStandardError();
                 QProcess::ProcessError error = process->error();
 
                 cleanup(process);
-                emit aborted(threadNumber, error, QString::fromUtf8(stderr));
+                emit aborted(threadNumber, error, QString::fromUtf8(errout));
                 return;
             }
         }