fix undefined in setup package

core/server/bootstrap.py

@@ -224,7 +224,10 @@ def get_certificate(cert_path,data_path,certbase,client_cert_path,user_name):
                                                 certbase, cert_path)
 
     cert = result[0]
-    ca_root = result[1]
+    if len (result) > 1:
+        ca_root = result[1]
+    else: None
+
     if cert == '1':
         print _('The request for signature was rejected!')
         return 1

core/server/clean.py

@@ -32,7 +32,7 @@ def clean (SID_FILE, PID_FILE, SID_PID, SIDS_DIR, PIDS_DIR):
 
     if os.path.isdir(SIDS_DIR):
         for filename in glob.glob(SIDS_DIR+"/*.sid"):
-            print 'remove',filename
+#            print 'remove',filename
             os.unlink (filename)
     if os.path.isdir(PIDS_DIR):
         for filename in glob.glob(PIDS_DIR+"/*.pid"):

core/server/edit_groups.py

@@ -100,7 +100,7 @@ class CoreWsdl:
             if not page_count:
                 page_count = len(list_group_name)
 
-            head = ['Group','Rights']
+            head = ['Group','Permissions']
             body = []
             fields = ['cl_group_name','']
 

core/server/setup_package.py

@@ -18,29 +18,24 @@
 __version__ = "3.0.0_beta2"
 __app__ = "calculate-lib"
 
-import sys, os, stat, re
+import sys, os
 from shutil import copy2
 import importlib
 
 from soaplib.serializers.primitive import String, Boolean, Integer
 from soaplib.serializers.clazz import Array, ClassSerializer
-from soaplib.service import rpc, DefinitionBase
+from soaplib.service import rpc
 from calculate.core.server.api_types import ReturnedMessage
-from calculate.core.server.api_types import ChoiceValue, Table, Option, Field, \
-                                           GroupField, ViewInfo, ViewParams
+from calculate.core.server.api_types import ViewInfo, ViewParams
 from calculate.core.server.decorators import Dec
 core_method = Dec.core_method
 
 from calculate.core.datavars import DataVarsCore
 from calculate.lib.cl_log import log
 from calculate.lib import datavars
-from calculate.lib.cl_print import color_print as old_color_print
-from calculate.lib.utils.files import (runOsCommand, scanDirectory, pathJoin,
-                                    listDirectory)
+from calculate.lib.utils.files import (scanDirectory, pathJoin)
 from calculate.lib.utils.common import getPasswdUsers
 import pwd
-from os import path
-from calculate.lib import cl_overriding
 from calculate.lib.utils.files import getModeFile
 import calculate.lib.cl_template as cl_template
 
@@ -370,7 +365,7 @@ class updateSystemConfigs(shareUpdateConfigs):
                 if dirsFiles is False:
                     self.ERROR(_("Error template in a package %s")\
                                     %nameAndVerPkg)
-                    self.ERROR(errMess)
+                    self.ERROR(clTempl.getError())
                     return False
                 copyFiles = clTempl.autoUpdateFiles
                 copyDirs = clTempl.autoUpdateDirs
@@ -410,11 +405,8 @@ class updateSystemConfigs(shareUpdateConfigs):
         return True
 
 class CoreWsdl:
-    from calculate.core.server.baseClass import Basic
-    from calculate.core.server.decorators import Dec
-
     @rpc(Integer, CoreSetupInfo, _returns = Array(ReturnedMessage))
-    @core_method(category=__('Utilities'),title=__('Configure package'),
+    @core_method(category=__('Configuration'),title=__('Configure package'),
         image='applications-other',
         gui=True,command='cl-core-setup',
         rights=['configure'])
@@ -422,7 +414,7 @@ class CoreWsdl:
         try:
             dv = self.get_cache(sid,"core_setup","vars")
             if not dv:
-                dv = core_setup_vars()
+                dv = self.core_setup_vars()
             else:
                 dv.processRefresh()
             if info:

ru/cl_core.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calculate-api\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-27 09:38+0300\n"
-"PO-Revision-Date: 2012-06-27 09:53+0300\n"
+"POT-Creation-Date: 2012-06-27 12:37+0300\n"
+"PO-Revision-Date: 2012-06-27 12:38+0300\n"
 "Last-Translator: Denis <ds@mail.ru>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -712,108 +712,107 @@ msgid "Not found method for %s"
 msgstr "Не найден метод для %s"
 
 #: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:295
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:320
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:363
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:321
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:364
 msgid "Method not found: "
 msgstr "Метод не найден: "
 
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:331
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:332
 msgid "Unknown parameter"
 msgstr "Неизвестный параметр"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:339
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:386
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:340
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:387
 msgid "method is not available"
 msgstr "метод не доступен"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:348
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:395
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:349
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:396
 msgid "Error in parameter "
 msgstr "Ошибка в параметре "
 
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:369
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:370
 msgid "Run process? (yes/no): "
 msgstr "Запустить процесс? (yes/no): "
 
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:374
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:375
 #: /var/calculate/mydir/git/calculate-api/core/server/test.py:140
 msgid "Interrupted by user"
 msgstr "Прервано пользователем"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:480
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:510
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:481
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:511
 msgid "yes"
 msgstr "да"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:482
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:512
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:483
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:513
 msgid "no"
 msgstr "нет"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:484
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:514
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:485
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:515
 msgid "auto"
 msgstr "авто"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:530
+#: /var/calculate/mydir/git/calculate-api/core/server/replace_class.py:531
 msgid "Not used"
 msgstr "Не используется"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:103
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:98
 #, python-format
 msgid "Configuring dependent packages: %s"
 msgstr ""
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:216
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:211
 msgid "Missing environment variable CONFIG_PROTECT"
 msgstr "Ошибка окружения переменной CONFIG_PROTECT"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:278
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:273
 msgid "Replace files:"
 msgstr "Заменённые файлы:"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:317
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:312
 #, python-format
 msgid "Package %s"
 msgstr "Пакет %s"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:318
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:313
 msgid "Update system cofiguration files"
 msgstr "Обновление системных конфигурационных файлов"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:320
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:315
 #, python-format
 msgid "Path '%s' does not exist"
 msgstr "Путь %s не существует"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:339
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:334
 msgid "Configuring {nameProgram} package by {mergeProgram}"
 msgstr "Конфигурация {nameProgram} пакетом {mergeProgram}"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:371
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:366
 #, python-format
 msgid "Error template in a package %s"
 msgstr "Ошибка шаблона в пакете %s"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:393
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:388
 #, python-format
 msgid "Package %s has changed files"
 msgstr "Пакет %s имеет изменённые файлы"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:403
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:398
 msgid "Not found templates"
 msgstr "Шаблон не найден"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:417
-#: /var/calculate/mydir/git/calculate-api/core/server/test.py:177
-msgid "Utilities"
-msgstr "Утилиты"
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:409
+msgid "Configuration"
+msgstr "Настройка"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:417
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:409
 msgid "Configure package"
 msgstr "Настройка пакета"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:466
+#: /var/calculate/mydir/git/calculate-api/core/server/setup_package.py:458
 msgid "Setup"
 msgstr "Настроить"
 
@@ -888,6 +887,10 @@ msgstr "Пожалуйста, обновите сервер"
 msgid "Version %s"
 msgstr "Версия %s"
 
+#: /var/calculate/mydir/git/calculate-api/core/server/test.py:177
+msgid "Utilities"
+msgstr "Утилиты"
+
 #: /var/calculate/mydir/git/calculate-api/core/server/test.py:260
 msgid "Test Method"
 msgstr "Тестовый метод"
@@ -983,13 +986,13 @@ msgstr "Сертификат клиента создан."
 msgid "no path to the client certificate"
 msgstr "не создан путь к сертификату клиента"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/bootstrap.py:255
+#: /var/calculate/mydir/git/calculate-api/core/server/bootstrap.py:256
 #: /var/calculate/mydir/git/calculate-api/core/server/cert_cmd.py:265
 #, python-format
 msgid "Certificate saved. Your certificate ID = %s"
 msgstr "Сертификат сохранён. Номер Вашего сертификата = %s"
 
-#: /var/calculate/mydir/git/calculate-api/core/server/bootstrap.py:367
+#: /var/calculate/mydir/git/calculate-api/core/server/bootstrap.py:368
 msgid "Do you really want to remove all certificates, requests and config files from the server?"
 msgstr "Вы действительно хотите удалить все сертификаты, запросы и конфигурационные файлы на сервере?"
 
@@ -997,12 +1000,12 @@ msgstr "Вы действительно хотите удалить все се
 msgid "Password: "
 msgstr "Пароль: "
 
-#: /var/calculate/mydir/git/calculate-api/core/server/methods_func.py:235
+#: /var/calculate/mydir/git/calculate-api/core/server/methods_func.py:250
 #, python-format
 msgid "Password for %s: "
 msgstr "Пароль для %s: "
 
-#: /var/calculate/mydir/git/calculate-api/core/server/methods_func.py:236
+#: /var/calculate/mydir/git/calculate-api/core/server/methods_func.py:251
 #, python-format
 msgid "Repeat password for %s: "
 msgstr "Повтор пароля для %s: "