Changeset 1aa6ed7


Ignore:
Timestamp:
07/18/13 07:45:01 (13 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
1b398c1, a662f8f
Parents:
6a903a7 (diff), 7dd1bc1 (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

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

Legend:

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

    r6a903a7 r1aa6ed7  
    272272      if(QFile::exists(dlDir+dlfile)){ //If the file was downloaded previously just use it 
    273273        needDownload=FALSE;  
    274         cmd = generateInstallCMD(dlfile); 
     274        cmd = generateInstallCMD(appID[i], dlfile); 
    275275      }else{  
    276276        cmd = generateDownloadCMD(appID[i], version); //need to download the file first  
     
    284284        if(QFile::exists(dlDir+dlfile)){ //If the file was downloaded previously just use it 
    285285          needDownload=FALSE;  
    286           cmd = generateInstallCMD(dlfile); 
     286          cmd = generateInstallCMD(appID[i], dlfile); 
    287287        }else{  
    288288          cmd = generateDownloadCMD(appID[i], version); //need to download the file first  
     
    798798 } 
    799799  
    800  QString PBIBackend::generateInstallCMD(QString filename){ 
     800 QString PBIBackend::generateInstallCMD(QString appID, QString filename){ 
    801801   QString output = "pbi_add --licagree "+filename; 
     802   output = addRootCMD(output, PBIHASH[appID].rootInstall); 
    802803   return output; 
    803804 } 
     
    974975         } 
    975976         //Now add the installation of this PBI to the queue 
    976          cmd = generateInstallCMD(PBIHASH[cDownload].downloadfile); 
     977         cmd = generateInstallCMD(cDownload, PBIHASH[cDownload].downloadfile); 
    977978         PENDINGINSTALL << cDownload+":::"+cmd; 
    978979       } 
     
    12111212         app.license=info[5]; app.appType=info[6]; app.tags=info[7].toLower().split(",");  
    12121213         app.description=info[8]; 
    1213          if(info[9]=="YES"){ app.requiresroot=TRUE; } 
     1214         if(info[9]=="true"){ app.requiresroot=TRUE; } 
    12141215         else{ app.requiresroot=FALSE; } 
    12151216         //Fix the website if needed 
  • src-qt4/pc-softwaremanager/pbiBackend.h

    rc71b68c r7dd1bc1  
    116116        QString generateXDGCMD(QString pbiID, QStringList actions, bool allusers = FALSE); 
    117117        QString generateDownloadCMD(QString appID, QString version=""); 
    118         QString generateInstallCMD(QString pbiID); 
     118        QString generateInstallCMD(QString appID, QString pbiID); 
    119119        QStringList removePbiCMD(QString pbiID, QStringList list); 
    120120         
Note: See TracChangeset for help on using the changeset viewer.