Changeset 79b8f5f


Ignore:
Timestamp:
11/27/13 13:10:05 (11 months ago)
Author:
shirkdog <shirkdog@…>
Parents:
8680865 (diff), b2eecb3 (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 b2eecb36720cd0e7e3759add472af8218de6d649 into 868086508b8b3ee1f72faae61154e53b49d96ab2

Files:
2 edited

Legend:

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

    rd04fae7b rb2eecb3  
    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]*[!\"$%^&*()_+=#'`@~:?<>|{}\\x5b;\\-.,\\x5d]*)+"); 
    4242    groupnameRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[_]*)+"); 
    4343} 
  • src-sh/pbi-manager10/pbi-manager

    re1117b0a rc15e380  
    12871287 
    12881288        # Make sure this port exists 
    1289         if [ ! -d "${PORTSDIR}/${PBI_MAKEPORT}" ] ; then 
     1289        if [ ! -d "${PORTSDIR}/${PBI_MAKEPORT}" -a "$PBI_PKGNGBUILD" != "YES" ] ; then 
    12901290                exit_err "No port (${PORTSDIR}/${PBI_MAKEPORT})" 
    12911291        fi 
     
    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.