Ignore:
Timestamp:
10/28/13 08:24:32 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
0ecb8f7
Parents:
7a4b57b
Message:

Exclude "/PBI-*.desktop" files from the classic package, and optimize the permissions check within a package by only reading the "*/Desktop" file within the package.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/life-preserver/lp-gui/LPGUtils.cpp

    rb2b0c62 r47cbe52  
    206206  //Create the exclude list and skip these files 
    207207  QStringList excludes; 
    208     excludes << "*flashplayer*"; //Don't overwrite the flash plugin 
     208    excludes << "*flashplayer*" << "*/PBI-*.desktop"; //Don't include the flash plugin/PBI entries 
    209209  for(int i=0; i<excludes.length(); i++){ 
    210210    cmd.replace("-czf /usr/home", " --exclude \'"+excludes[i]+"\' -czf /usr/home"); 
     
    226226  if( !QFile::exists(packagePath) ){ return false; } 
    227227  //Check the username of the home dir in the package 
    228   QStringList ret = LPBackend::getCmdOutput("tar -tvf "+packagePath); 
     228  QStringList ret = LPBackend::getCmdOutput("tar -tvf "+packagePath+" -q \"*/Desktop\""); 
    229229  if(ret.isEmpty()){ return false; } 
    230230  QString username = ret[0].section(" ",2,2,QString::SectionSkipEmpty).simplified(); 
Note: See TracChangeset for help on using the changeset viewer.