Changeset 6b68456


Ignore:
Timestamp:
07/17/13 10:52:30 (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
868c95d
Parents:
ec6772f
Message:

Remove failing check if PBI has been updated, and instead use the exitStatus() && exitCode() from
the "pbi_update" process. That should always return "0" if it was successfull, or non-0 if not.

Location:
src-qt4/pc-softwaremanager
Files:
2 edited

Legend:

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

    r4e436f3 r6b68456  
    918918     //Update the PBIHASH for installed versions 
    919919     slotSyncToDatabase(TRUE); 
    920      //Check that the old version is no longer installed 
    921      if(!isInstalled(cUpdate).isEmpty()){ 
    922        //Error completing the update - old version still installed 
    923        QString title = QString(tr("%1 Update Error:")).arg(PBIHASH[cUpdate].name); 
    924        QString err = tr("The PBI could not be updated, please try again later"); 
    925        QStringList log = PMAN->getProcessLog(ProcessManager::UPDATE); 
    926        emit Error(title,err,log); 
    927      } 
    928920     cUpdate.clear(); //remove that it is finished 
    929921     sUpdate=FALSE; 
  • src-qt4/pc-softwaremanager/processManager.cpp

    rc71b68c r6b68456  
    195195 
    196196void ProcessManager::slotUpProcFinished(){ 
    197   if(upProc->exitStatus() != QProcess::NormalExit){ 
     197  if(upProc->exitStatus() != QProcess::NormalExit || upProc->exitCode() != 0){ 
    198198    //Emit the command log 
    199199    qDebug() << "Update Process Error Log:\n"<<upLog.join("\n"); 
Note: See TracChangeset for help on using the changeset viewer.