Changeset 7dd1bc1


Ignore:
Timestamp:
Jul 18, 2013 7:33:22 AM (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
4f9718b
Parents:
a61a5ce
Message:

Fix the root install problem, had to adjust the install cmd function

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

Legend:

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

    ra61a5ce r7dd1bc1  
    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 } 
     
    955956         } 
    956957         //Now add the installation of this PBI to the queue 
    957          cmd = generateInstallCMD(PBIHASH[cDownload].downloadfile); 
     958         cmd = generateInstallCMD(cDownload, PBIHASH[cDownload].downloadfile); 
    958959         PENDINGINSTALL << cDownload+":::"+cmd; 
    959960       } 
     
    11921193         app.license=info[5]; app.appType=info[6]; app.tags=info[7].toLower().split(",");  
    11931194         app.description=info[8]; 
    1194          if(info[9]=="YES"){ app.requiresroot=TRUE; } 
     1195         if(info[9]=="true"){ app.requiresroot=TRUE; } 
    11951196         else{ app.requiresroot=FALSE; } 
    11961197         //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.