saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #27766 from jfindlay/debmail

Browse source 
better check for debian userdel error
This commit is contained in:
Mike Place 2015-10-12 09:14:33 -06:00
commit 86cc7b5537
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/modules/useradd.py
View file

@ -4,9 +4,6 @@ Manage users with the useradd command
'''
from __future__ import absolute_import
# Import python libs
import re
try:
import pwd
HAS_PWD = True
@ -22,10 +19,6 @@ from salt.exceptions import CommandExecutionError
log = logging.getLogger(__name__)
RETCODE_12_ERROR_REGEX = re.compile(
r'userdel(.*)warning(.*)/var/mail(.*)No such file or directory'
)
# Define the module's virtual name
__virtualname__ = 'user'
@ -240,7 +233,7 @@ def delete(name, remove=False, force=False):
if __grains__['os_family'] not in ('Debian',):
return False
if RETCODE_12_ERROR_REGEX.match(ret['stderr']) is not None:
if 'var/mail' in ret['stderr'] or 'var/spool/mail' in ret['stderr']:
# We've hit the bug, let's log it and not fail
log.debug(
'While the userdel exited with code 12, this is a known bug on '