Changeset 15abd22


Ignore:
Timestamp:
09/10/13 12:57:57 (14 months ago)
Author:
Ken <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
e858767
Parents:
ea627be (diff), 03429d8 (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
  • src-sh/lpreserver/lpreserver

    r59f367e r7c0c657  
    5252        set - Set lpreserver options 
    5353     status - List datasets, along with last snapshot / replication date  
    54       zpool - Mange a zpool by attaching / detaching disks 
     54      zpool - Manage a zpool by attaching / detaching disks 
    5555__EOF__ 
    5656}; 
  • src-qt4/life-preserver/LPBackend.cpp

    r284b216 rea627be  
    188188  //Copy the given file from the snapshot back into the main dataset 
    189189  // -- filepath: full path to the file in the snapshot directory 
    190    
     190  //qDebug() << " - Revert file:" << filepath; 
     191  filepath.replace("~",QDir::homePath()); 
    191192  //Check that the file path is complete and the file exists 
    192193  if(!QFile::exists(filepath)){ 
     
    223224  } 
    224225  //perform the copy 
     226  qDebug() <<  " - File Reversion:" << filepath << newfilepath; 
    225227  bool ok = QFile::copy(filepath,newfilepath); 
    226228  //return the path to the new file if the copy was successful 
  • src-qt4/life-preserver/LPWatcher.cpp

    r559e01f rea627be  
    252252 
    253253void LPWatcher::checkErrorFile(){ 
     254  //Check zpool status and report any errors/processes 
    254255  if(QFile::exists(FILE_ERROR)){ 
    255256    //Read the file to determine the cause of the error 
Note: See TracChangeset for help on using the changeset viewer.