# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1265978034 -3600
# Node ID 242e764696641f2a6b799331e0ed3b193e72b906
# Parent  259e7ef7c3738b506283cbd14f7cef07c8ad0820# Parent  8968c50818db50be0f8089eb2943e9760e8acde8
merge 3.5/stable heads

diff -r 259e7ef7c373 -r 242e76469664 server/sources/ldapuser.py
--- a/server/sources/ldapuser.py	Fri Feb 12 13:32:14 2010 +0100
+++ b/server/sources/ldapuser.py	Fri Feb 12 13:33:54 2010 +0100
@@ -78,7 +78,7 @@
         ('auth-realm',
          {'type' : 'string',
           'default': None,
-          'help': 'realm to use when using gssapp/kerberos authentication.',
+          'help': 'realm to use when using gssapi/kerberos authentication.',
           'group': 'ldap-source', 'inputlevel': 1,
           }),
 
diff -r 259e7ef7c373 -r 242e76469664 toolsutils.py
--- a/toolsutils.py	Fri Feb 12 13:32:14 2010 +0100
+++ b/toolsutils.py	Fri Feb 12 13:33:54 2010 +0100
@@ -10,6 +10,7 @@
 # XXX move most of this in logilab.common (shellutils ?)
 
 import os, sys
+import subprocess
 from os import listdir, makedirs, environ, chmod, walk, remove
 from os.path import exists, join, abspath, normpath
 
@@ -72,8 +73,8 @@
     user decision
     """
     import shutil
-    p_output = os.popen('diff -u %s %s' % (appl_file, ref_file), 'r')
-    diffs = p_output.read()
+    pipe = subprocess.Popen(['diff', '-u', appl_file, ref_file], stdout=subprocess.PIPE)
+    diffs = pipe.stdout.read()
     if diffs:
         if askconfirm:
             print