git-svn-id: http://svn.calculate.ru/calculate2/calculate-server/trunk@1147 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_ldap.py

@@ -597,16 +597,22 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
             # В случае почтового релея
             elif service == "mail_relay":
                 if self.getRunDaemons(["postfix"]):
-                    textLine = self.execProg("/etc/init.d/postfix stop")
-                    if not ("ok" in textLine):
+                    textLines = self.execProg("/etc/init.d/postfix stop", False,
+                                               False)
+                    if not (textLines and type(textLines) == types.ListType and\
+                            "ok" in textLines[-1] or textLines and\
+                            "ok" in textLines):
                         self.printERROR( "Postfix" + " " +
                                 _("service is not stopped"))
                         flagError = True
                         break
             elif service == "mail":
                 if self.getRunDaemons(["postfix"]):
-                    textLine = self.execProg("/etc/init.d/postfix stop")
-                    if not ("ok" in textLine):
+                    textLines = self.execProg("/etc/init.d/postfix stop", False,
+                                              False)
+                    if not (textLines and type(textLines) == types.ListType and\
+                            "ok" in textLines[-1] or textLines and\
+                            "ok" in textLines):
                         self.printERROR( "Postfix" + " " +
                                 _("service is not stopped"))
                         flagError = True