Ignore:
Timestamp:
08/22/13 11:54:07 (11 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
ac5b620
Parents:
f6bee85
Message:

Fix up the error detection for the AppCafe? process manager, make sure it checks return codes instead of just the process error flag.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-softwaremanager/processManager.cpp

    r80faf74 rdee1bcb  
    233233 
    234234void ProcessManager::slotRemProcFinished(){ 
    235   if(remProc->exitStatus() != QProcess::NormalExit){ 
     235  if(remProc->exitStatus() != QProcess::NormalExit || remProc->exitCode() != 0){ 
    236236    qDebug() << "Removal Process Error Log:\n"<<remLog.join("\n"); 
    237237    emit ProcessError(REMOVE, remLog); 
     
    261261 
    262262void ProcessManager::slotDlProcFinished(){ 
    263   if(dlProc->exitStatus() != QProcess::NormalExit){ 
     263  if(dlProc->exitStatus() != QProcess::NormalExit || dlProc->exitCode() != 0){ 
    264264    qDebug() << "Download Process Error Log:\n"<<dlLog.join("\n"); 
    265265    emit ProcessError(DOWNLOAD, dlLog); 
     
    282282 
    283283void ProcessManager::slotInProcFinished(){ 
    284   if(inProc->exitStatus() != QProcess::NormalExit){ 
     284  if(inProc->exitStatus() != QProcess::NormalExit || inProc->exitCode() != 0){ 
    285285    qDebug() << "Install Process Error Log:\n"<<inLog.join("\n"); 
    286286    emit ProcessError(INSTALL, inLog); 
     
    298298 
    299299void ProcessManager::slotOtProcFinished(){ 
    300   if(otProc->exitStatus() != QProcess::NormalExit){ 
     300  if(otProc->exitStatus() != QProcess::NormalExit || otProc->exitCode() != 0){ 
    301301    QString msg = otProc->readAllStandardError(); 
    302302    if(msg.isEmpty()){ msg = otProc->readAllStandardOutput(); } 
Note: See TracChangeset for help on using the changeset viewer.