Changeset e095cc0


Ignore:
Timestamp:
05/06/14 12:52:09 (15 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
086ab7b
Parents:
ddb1adb4
Message:

Fix the locking/unlocking of packages within jails.

File:
1 edited

Legend:

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

    racb0f00 re095cc0  
    6464void PBIBackend::syncLocalPackages(){ 
    6565  //force the backend to resync the locally installed package lists/details 
    66   slotSyncToDatabase(true);      
     66  slotSyncToDatabase(true); 
     67  checkForJails(); //also recheck any jails 
    6768} 
    6869 
     
    230231 
    231232void PBIBackend::lockApp(QStringList appID, QString injail){ 
     233  QHash<QString, NGApp> hash; 
     234  if(JAILPKGS.contains(injail)){ hash = JAILPKGS[injail]; } 
    232235  for(int i=0; i<appID.length(); i++){ 
    233236    NGApp app; 
    234     if(APPHASH.contains(appID[i])){ app = APPHASH[appID[i]]; } 
     237    if(hash.contains(appID[i])){ app = hash[appID[i]]; } 
     238    else if(APPHASH.contains(appID[i])){ app = APPHASH[appID[i]]; } 
    235239    else if(PKGHASH.contains(appID[i])){ app = PKGHASH[appID[i]]; } 
    236240    else{ continue; } 
     
    247251 
    248252void PBIBackend::unlockApp(QStringList appID, QString injail){ 
     253  QHash<QString, NGApp> hash; 
     254  if(JAILPKGS.contains(injail)){ hash = JAILPKGS[injail]; } 
    249255  for(int i=0; i<appID.length(); i++){ 
    250256    NGApp app; 
    251     if(APPHASH.contains(appID[i])){ app = APPHASH[appID[i]]; } 
     257    if(hash.contains(appID[i])){ app = hash[appID[i]]; } 
     258    else if(APPHASH.contains(appID[i])){ app = APPHASH[appID[i]]; } 
    252259    else if(PKGHASH.contains(appID[i])){ app = PKGHASH[appID[i]]; } 
    253260    else{ continue; } 
Note: See TracChangeset for help on using the changeset viewer.