mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-06 21:32:49 +00:00
Because paramiko using a pty can't distinguish stderr and stdout, remove handling that
treated -D as a way to show stderr, and make sure modules don't include things on stderr. Update docs and test module script to come into line.
This commit is contained in:
@@ -30,9 +30,6 @@ import traceback
|
||||
APT_PATH = "/usr/bin/apt-get"
|
||||
APT = "DEBIAN_PRIORITY=critical %s" % APT_PATH
|
||||
|
||||
def debug(msg):
|
||||
print >>sys.stderr, msg
|
||||
|
||||
def exit_json(rc=0, **kwargs):
|
||||
print json.dumps(kwargs)
|
||||
sys.exit(rc)
|
||||
|
||||
@@ -31,14 +31,8 @@ GROUPADD = "/usr/sbin/groupadd"
|
||||
GROUPDEL = "/usr/sbin/groupdel"
|
||||
GROUPMOD = "/usr/sbin/groupmod"
|
||||
|
||||
def debug(msg):
|
||||
# ansible ignores stderr, so it's safe to use for debug
|
||||
print >>sys.stderr, msg
|
||||
#pass
|
||||
|
||||
def exit_json(rc=0, **kwargs):
|
||||
if 'name' in kwargs:
|
||||
debug("add group info to exit_json")
|
||||
add_group_info(kwargs)
|
||||
print json.dumps(kwargs)
|
||||
sys.exit(rc)
|
||||
@@ -59,7 +53,6 @@ def add_group_info(kwargs):
|
||||
|
||||
def group_del(group):
|
||||
cmd = [GROUPDEL, group]
|
||||
debug("Arguments to groupdel: %s" % (" ".join(cmd)))
|
||||
rc = subprocess.call(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
if rc == 0:
|
||||
return True
|
||||
@@ -73,7 +66,6 @@ def group_add(group, **kwargs):
|
||||
cmd.append('-g')
|
||||
cmd.append(kwargs[key])
|
||||
cmd.append(group)
|
||||
debug("Arguments to groupadd: %s" % (" ".join(cmd)))
|
||||
rc = subprocess.call(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
if rc == 0:
|
||||
return True
|
||||
@@ -91,7 +83,6 @@ def group_mod(group, **kwargs):
|
||||
if len(cmd) == 1:
|
||||
return False
|
||||
cmd.append(group)
|
||||
debug("Arguments to groupmod: %s" % (" ".join(cmd)))
|
||||
rc = subprocess.call(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
if rc == 0:
|
||||
return True
|
||||
|
||||
@@ -33,14 +33,8 @@ USERADD = "/usr/sbin/useradd"
|
||||
USERMOD = "/usr/sbin/usermod"
|
||||
USERDEL = "/usr/sbin/userdel"
|
||||
|
||||
def debug(msg):
|
||||
# ansible ignores stderr, so it's safe to use for debug
|
||||
print >>sys.stderr, msg
|
||||
#pass
|
||||
|
||||
def exit_json(rc=0, **kwargs):
|
||||
if 'name' in kwargs:
|
||||
debug("add user info to exit_json")
|
||||
add_user_info(kwargs)
|
||||
print json.dumps(kwargs)
|
||||
sys.exit(rc)
|
||||
@@ -75,7 +69,6 @@ def user_del(user, **kwargs):
|
||||
elif key == 'remove' and kwargs[key]:
|
||||
cmd.append('-r')
|
||||
cmd.append(user)
|
||||
debug("Arguments to userdel: %s" % (" ".join(cmd)))
|
||||
rc = subprocess.call(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
if rc == 0:
|
||||
return True
|
||||
@@ -118,7 +111,6 @@ def user_add(user, **kwargs):
|
||||
else:
|
||||
cmd.append('-M')
|
||||
cmd.append(user)
|
||||
debug("Arguments to useradd: %s" % (" ".join(cmd)))
|
||||
rc = subprocess.call(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
if rc == 0:
|
||||
return True
|
||||
@@ -172,7 +164,6 @@ def user_mod(user, **kwargs):
|
||||
if len(cmd) == 1:
|
||||
return False
|
||||
cmd.append(user)
|
||||
debug("Arguments to usermod: %s" % (" ".join(cmd)))
|
||||
rc = subprocess.call(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
if rc == 0:
|
||||
return True
|
||||
|
||||
Reference in New Issue
Block a user