Changeset 8680865


Ignore:
Timestamp:
11/27/13 12:25:15 (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
cef0aac, 4309def, 79b8f5f
Parents:
c15e380 (diff), 8ad6faf (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:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-usermanager/usermanagerback.cpp

    rec5b219 rd04fae7b  
    3939    homeLocRegExp.setPattern("^(/usr)?/home/?"); 
    4040    usernameRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[_]*)+"); 
    41     passwordRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[!\"$%^&*()_+=#'`@~:?<>|{}\\-.]*)+"); 
     41    passwordRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[!\"$%^&*()_+=#'`@~:?<>|{}\\-.,]*)+"); 
    4242    groupnameRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[_]*)+"); 
    4343} 
  • src-sh/pbi-manager10/pbi-manager

    r8e65899 rc15e380  
    76347634{ 
    76357635  local _lPortRaw="$1" 
     7636  local pkgName="" 
    76367637 
    76377638  # Remove any trailing '/' 
     
    76457646  echo "Checking port: $_lPort" 
    76467647 
     7648  if [ -n "$PBI_PKGNGBUILD" ] ; then 
     7649     pkgName=`pkg-static rquery '%n' $_lPortRaw` 
     7650  else 
     7651     pkgName=`make -V PKGNAME -C $_lPort PORTSDIR=${PORTSDIR}` 
     7652  fi 
     7653 
    76477654  # Make sure this port isn't already loaded 
    7648   local pkgName=`make -V PKGNAME -C $_lPort PORTSDIR=${PORTSDIR}` 
    76497655  pkg info -e ${pkgName} 
    76507656  if [ $? -eq 0 ] ; then return ; fi 
Note: See TracChangeset for help on using the changeset viewer.