Changeset 1e75537


Ignore:
Timestamp:
11/07/13 10:12:17 (13 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
287fef9
Parents:
8afc51a (diff), d44b108 (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:
4 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-softwaremanager/extras.h

    r78fa8b2 r0b12758  
    110110   out.remove(" "); 
    111111   out.remove("\t"); 
    112    out.simplified(); 
     112   out = out.simplified(); 
    113113   return out; 
    114114 } 
  • src-qt4/pc-softwaremanager/pbiBackend.cpp

    r7cc177e rd44b108  
    11321132   } 
    11331133   else if(ID == ProcessManager::DOWNLOAD){  
    1134      if(!sDownload){ //not stopped manually 
    1135        if(APPHASH.contains(cDownload)){name = APPHASH[cDownload].name; } 
    1136        title = QString(tr("%1 Download Error:")).arg(name); 
    1137        message = tr("The download process experienced an error and could not be completed"); 
    1138      } 
     1134       //The ProcessFinished function has a bit more robust check for download failures 
     1135       //       - use it instead to prevent duplicate error messages 
    11391136   } 
    11401137   else if(ID == ProcessManager::OTHER){  
  • src-qt4/pc-softwaremanager/pbiDBAccess.cpp

    r78fa8b2 r8bcbb15  
    362362  } 
    363363  if(output.endsWith("\n")){ output.chop(1); } 
    364   output.simplified(); 
    365   return output; 
    366 } 
     364  output = output.simplified(); 
     365  return output; 
     366} 
  • src-sh/libsh/functions.sh

    rbd99c30 r8afc51a  
    427427 
    428428   local _name="${_chkDir#${_mp}}" 
     429 
     430   # Make sure we have a '/' at the start of dataset 
     431   if [ "`echo ${_name} | cut -c 1`" != "/" ] ; then _name="/${_name}"; fi 
     432 
    429433   echo "${_name}" 
    430434   return 0 
Note: See TracChangeset for help on using the changeset viewer.