Changeset 629cca35


Ignore:
Timestamp:
Aug 22, 2013 11:56:53 AM (8 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
65fd04b2
Parents:
2748876 (diff), ac5b620 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
3 edited

Legend:

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

    re46485b rdee1bcb  
    9999        ProcessManager *PMAN; 
    100100        QString cDownload, cInstall, cRemove, cUpdate, cDownloadFile, cOther; //currently running command/pbi 
    101         bool sDownload, sInstall, sRemove, sUpdate; //flag that these processes were Stopped 
     101        bool sDownload, sInstall, sRemove, sUpdate,; //flag that these processes were Stopped 
    102102        QStringList PENDINGDL, PENDINGINSTALL, PENDINGREMOVAL, PENDINGUPDATE, PENDINGOTHER; 
    103103        QString lDownload, lInstall, lRemove, lUpdate; //latest string output from process 
  • 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(); } 
  • src-sh/port-files/pkg-plist

    r129cfcd r2748876  
    120120share/pc-sysinstall/backend/functions-mountoptical.sh 
    121121share/pc-sysinstall/backend/functions-bsdlabel.sh 
     122share/pc-sysinstall/backend/functions-zfsrestore.sh 
    122123share/pc-sysinstall/backend/startautoinstall.sh 
    123124share/pc-sysinstall/backend/installimage.sh 
Note: See TracChangeset for help on using the changeset viewer.