Changeset 4ace0576


Ignore:
Timestamp:
11/22/13 09:24:52 (18 months ago)
Author:
yurkis <yurkis@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
7e0282e4
Parents:
f769034
Message:

More error handling

Location:
src-qt4/pc-updatecenter
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-updatecenter/mainwindow.cpp

    rdc2ff91 r4ace0576  
    370370    { 
    371371        ui->pkgUpdateLog->append(progress.mLogMessages[i]); 
    372         qDebug()<<"<<<"<<progress.mLogMessages[i]; 
    373372    } 
    374373} 
  • src-qt4/pc-updatecenter/pkgcontroller.cpp

    rf769034 r4ace0576  
    2828static const char* const PKG_INSTALL_DONE = "... done"; 
    2929 
     30static const char* const PKG_NETWORK_ERROR = ": No address record"; 
     31 
    3032 
    3133typedef enum{ 
     
    7779    if (eCommonInfo == curChkrState) 
    7880    { 
     81        if (line.contains(PKG_NETWORK_ERROR)) 
     82        { 
     83            reportError(tr("Error during update check. Check network connection")); 
     84        } 
    7985        if ( line.contains(FULLY_UPDATED_MESSAGE)) 
    8086        { 
     
    350356} 
    351357 
     358void CPkgController::onCheckProcessfinished(int exitCode) 
     359{ 
     360    if (!exitCode) 
     361    { 
     362        reportError(tr("Update check error")); 
     363    } 
     364} 
     365 
    352366void CPkgController::autoResolveConflict(bool isAutoResolve) 
    353367{ 
  • src-qt4/pc-updatecenter/syscontroller.cpp

    rdc2ff91 r4ace0576  
    44 
    55_STRING_CONSTANT PC_UPDATE_COMMAND = "pc-updatemanager"; 
    6 _STRING_CONSTANT FBSD_UPDATE_COMMAND = "cat"; 
    7 //_STRING_CONSTANT FBSD_UPDATE_COMMAND = "pc-fbsdupdatecheck"; 
     6//_STRING_CONSTANT FBSD_UPDATE_COMMAND = "cat"; 
     7_STRING_CONSTANT FBSD_UPDATE_COMMAND = "pc-fbsdupdatecheck"; 
    88static const QStringList PC_UPDATE_ARGS(QStringList()<<"check"); 
    9 //static const QStringList FBSD_UPDATE_ARGS (QStringList()<<"update"); 
    10 static const QStringList FBSD_UPDATE_ARGS (QStringList()<<"/home/yurkis/_sysbasesys_check.txt"); 
     9static const QStringList FBSD_UPDATE_ARGS (QStringList()<<"update"); 
     10//static const QStringList FBSD_UPDATE_ARGS (QStringList()<<"/home/yurkis/_sysbasesys_check.txt"); 
    1111 
    1212_STRING_CONSTANT NAME_TAG = "NAME:"; 
     
    2727_STRING_CONSTANT FILES_TO_UPDATE = "The following files will be updated as part of updating to"; 
    2828 
     29_STRING_CONSTANT NETWORKING_PROBLEM= "No mirrors remaining, giving up."; 
     30 
    2931CSysController::CSysController() 
    3032{ 
     
    211213    } 
    212214 
     215    if (line.contains(NETWORKING_PROBLEM) && (!mvUpdates.size())) 
     216    { 
     217        reportError(tr("Error during update check. Check network connection")); 
     218    } 
     219 
    213220    if (line.contains(FILES_MODIFYED_LOCALLY)) 
    214221    { 
Note: See TracChangeset for help on using the changeset viewer.