Changeset 0debaa7


Ignore:
Timestamp:
03/05/14 09:19:01 (5 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2
Children:
73f107f, f5ad808
Parents:
65e10ad (diff), 7fa3570 (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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/port-make.conf

    rc1e0e78 r2ead8ff  
    4444ca_root_nss_SET=ETCSYMLINK 
    4545centerim_SET=GG LJ RSS GPGME JABBER IRC AIM YAHOO MSN FRIBIDI MULTIBYTE 
     46chromium_SET=CODECS CLANG PULSEAUDIO 
    4647claws-mail_SET=BOGOFILTER GPGME SPAMASSASSIN 
    4748conky_SET=XFT LUA LUA_CAIRO LUA_IMLIB2 IMLIB2 
     
    5354easytag_SET=WAVEPACK 
    5455evolution_SET=SPAMASSASSIN 
     56firefox_UNSET=ALSA 
     57firefox_SET=PULSEAUDIO 
    5558freeciv_SET=SDL 
    5659freetype2_SET=LCD_FILTERING 
  • src-qt4/life-preserver/lp-gui/LPGUtils.cpp

    r109c737 r65e10ad  
    165165  if( !nDir.exists() ){ 
    166166    //Create the new Directory 
     167    qDebug() << "Re-Create parent directory structure:" << newPath; 
    167168    nDir.cdUp(); 
    168     ok = nDir.mkdir(newPath.section("/",-1)); 
     169    ok = nDir.mkpath(newPath.section("/",-1)); //also create all parent directories if necessary 
    169170    if(ok){  
     171      qDebug() << " - Reset permissions on the main parent dir to match snapshot"; 
    170172      nDir.cd(newPath.section("/",-1));  
    171173      QFile::setPermissions(newPath, QFile::permissions(oldPath)); //make sure the new dir has the old permissions 
  • src-qt4/life-preserver/lp-gui/LPMain.cpp

    r109c737 r65e10ad  
    344344  QString filePath = fsModel->filePath( ui->treeView->currentIndex() ); 
    345345  qDebug() << " Restore file(s):" << filePath; 
    346   QString destDir = filePath.remove("/.zfs/snapshot/"+ui->label_snapshot->text()); 
     346  QFileInfo info(filePath);      
     347  QString destDir = filePath; 
     348        destDir.remove("/.zfs/snapshot/"+ui->label_snapshot->text()); 
    347349        destDir.chop( filePath.section("/",-1).size()+1 ); //get rid of the filename at the end 
    348350        while(!QFile::exists(destDir)){ destDir.chop( destDir.section("/",-1).size() +1); } 
     
    351353  //Perform the reversion(s) 
    352354  QStringList errors; 
    353   if(QFileInfo(filePath).isDir()){ 
     355  if( info.isDir() ){ 
    354356    //Is a directory 
    355357    showWaitBox( QString(tr("Restoring Directory: %1")).arg(newFilePath) ); 
Note: See TracChangeset for help on using the changeset viewer.