Отмена предыдущего изменения

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

pym/cl_client.py

@@ -1021,7 +1021,6 @@ conjunction with the 'login' or 'logout'")
             self.clVars.flIniFile()
             if not self.applyRelevanceProfiles(domain):
                 return False
-        self.restartDBus()
         return True
 
     def delDomain(self):
@@ -1255,21 +1254,17 @@ or ld_bind_dn or ld_bind_pw")
             self.printERROR(_("Not apply 'install/domain' profiles"))
             return False
         # Рестартуем dbus
-        self.restartDBus()
+        if os.path.exists('/etc/init.d/dbus'):
+            textLines = self.execProg("/etc/init.d/dbus restart", False, False)
+            if not (textLines and type(textLines) == types.ListType and\
+                "ok" in textLines[-1] or textLines and "ok" in textLines):
+                self.printWARNING(_("Error restarting /etc/init.d/dbus")+" ...")
+                return False
         if not self.setDaemonAutostart("client"):
             return False
         self.printOK(_("Computer added to domain %s")%domain + " ...")
         return True
 
-    def restartDBus(self):
-        """Перезапускаем службу D-Bus"""
-        dbusDaemon = '/etc/init.d/dbus'
-        if os.path.exists(dbusDaemon):
-            if os.system(dbusDaemon + ' restart &>/dev/null') != 0:
-                self.printWARNING(_("Error restarting")+" "+dbusDaemon+" ...")
-                return False
-        return True
-
     def removePrivateFiles(self, userHome):
         """Удаление приватных файлов"""
         privateFiles = ['.kde4/share/apps/kwallet/kdewallet.kwl']