Changeset 5ea46879


Ignore:
Timestamp:
09/12/13 12:35:32 (12 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
Children:
4f9718b
Parents:
b3ee7b3 (diff), 6b017ea (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/backend/functions.sh

    rc0e6494 r6b017ea  
    411411      exit_err "No such device: $disk" 
    412412      exit 0 
     413   fi 
     414 
     415   zpool list -H -v | awk '{print $1}' | grep -q "^$disk" 
     416   if [ $? -eq 0 ] ; then 
     417      exit_err "Error: This disk is already apart of a zpool!" 
    413418   fi 
    414419 
  • src-sh/lpreserver/lpreserver

    rc0e6494 rde39bc3b  
    408408           listsnap) help_listsnap ;; 
    409409           revertsnap) help_revertsnap ;; 
    410            zpool) help_zpol ;; 
     410           zpool) help_zpool ;; 
    411411           replicate) help_replicate ;; 
    412412           cronsnap) help_cronsnap ;; 
  • src-qt4/pc-mounttray/mountTray.cpp

    r11b9eef rb3ee7b3  
    303303  //Open the default file manager to the given directory as that user 
    304304  qDebug() << "Opening the media directory with user permissions"; 
    305   QString cmd = "su -m "+USERNAME+" -c \'xdg-open \""+dir+"\"\' &"; 
    306   if(DEBUG_MODE){ qDebug() << " -cmd:" << cmd; } 
    307   system( cmd.toUtf8() );  
     305  QString cmd = "su -m "+USERNAME+" -c \"xdg-open \'"+dir+"\' \""; 
     306  if(DEBUG_MODE){ qDebug() << " -cmd:" << cmd ; } 
     307  cmd.prepend("("); cmd.append(") &"); 
     308  system( cmd.toUtf8() ); 
    308309} 
    309310 
Note: See TracChangeset for help on using the changeset viewer.