Changeset 8ad6faf


Ignore:
Timestamp:
11/27/13 10:56:30 (13 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:
4f9718b
Parents:
8e65899 (diff), d04fae7b (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 pull request #8 from shirkdog/master

Fix for bug #843 in usermanagerback.cpp. Adding in a comma to the regex pattern

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

    re1117b0a r8e65899  
    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 
Note: See TracChangeset for help on using the changeset viewer.