Changeset bb7f3a3


Ignore:
Timestamp:
05/11/14 12:30:08 (11 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1
Children:
bbc8497
Parents:
5c665ecb
Message:

Fix up the libPCBSD pkg process parsing. Now it will properly detect/display the conflict resolution dialog.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/libpcbsd/utils/pcbsd-DLProcess.cpp

    r32cf5ff rbb7f3a3  
    142142     // with the new JSON parser 
    143143     // Moved 2/18/14 to this class from pc-pkgmanager by Ken Moore 
    144  
    145      // Look for any "msg" lines 
    146      if ( line.indexOf("\"msg") != -1 ) { 
    147           line.remove(0, line.indexOf("\"msg") + 8); 
    148           line.truncate(line.lastIndexOf("\"")); 
    149           emit UpdateMessage(line); 
    150           return; 
    151      } 
    152  
     144     //qDebug() << " -- pkg line:" << line; 
    153145     // Look for a download status update 
    154146     if ( line.indexOf("\"INFO_FETCH") != -1 && line.indexOf("\"url\"") != -1 ) { 
     
    212204           ConflictList.clear(); //already sent an answer - clear the internal list 
    213205        } 
     206     }else{ 
     207          //Just emit the message 
     208          //line.remove(0, line.indexOf("\"msg") + 8); 
     209          //line.truncate(line.lastIndexOf("\"")); 
     210          emit UpdateMessage(line); 
     211          return; 
    214212     } 
    215213} 
     
    285283        // PBI Download format 
    286284        parsePBILine(line); 
     285      }else if(DLTYPE == 1){ 
     286        //PKG Download format 
     287        //qDebug() << "pkg message: "<< line; 
     288        parsePKGLine(line); 
    287289      }else if(DLTYPE == 2){ 
    288290        // CDN Download format 
Note: See TracChangeset for help on using the changeset viewer.