From 31f6cd6408a9daa49eed974abb81735886dfa20c Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Fri, 27 Apr 2012 01:25:38 -0400
Subject: [PATCH] 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.

---
 apt   | 3 ---
 group | 9 ---------
 user  | 9 ---------
 3 files changed, 21 deletions(-)

diff --git a/apt b/apt
index e3ebf0c6733..57e98e49f5d 100755
--- a/apt
+++ b/apt
@@ -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)
diff --git a/group b/group
index 99fa425988a..20984c4d771 100755
--- a/group
+++ b/group
@@ -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
diff --git a/user b/user
index e8e64520dcc..ba825e9b1ac 100755
--- a/user
+++ b/user
@@ -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