calculate
/
calculate-utils-2.1-server
6
0
Fork 0
Code Issues 3 Pull Requests Releases 1 Wiki Activity

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

Browse Source
develop
asamoukin 16 years ago
parent c7a51f9b9c
commit a607591fef
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

40
pym/cl_ldap.py
Unescape View File

@ -374,7 +374,7 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
return True
else:
self.printError(_("ERROR") + ": " + execStr)
self.printError(_("Not added at default runlevel")+ " ...")
self.printError(_("Can not add at default runlevel")+ " ...")
return False
def delDaemonAutostart(self, daemon):
@ -1802,12 +1802,12 @@ class servUnix(shareLdap):
if not flagError and options.has_key('i'):
photoFile = options['i']
if not self.setJpegPhotoUser(userName, photoFile):
self.printERROR(_("Not added jpeg photo for user") + " " +\
self.printERROR(_("Can not add jpeg photo for user") + " " +\
str(userName))
flagError = True
if flagError:
self.delUserUnixServer(userName, {}, False, False)
self.printERROR (_("Can not added user")+ " " + str(userName))
self.printERROR (_("Can not add user")+ " " + str(userName))
return False
if printSuccess:
if flagAdd.has_key('group'):
@ -3330,7 +3330,7 @@ in Unix service ...") %str(primaryMail))
optUnix['c'] = options['c']
if not self.servUnixObj.addUserUnixServer(userName, optUnix,
False):
self.printERROR (_("Can not added user")+ " " +\
self.printERROR (_("Can not add user")+ " " +\
str(userName) + _(" in Unix service"))
return False
resUnix = self.servUnixObj.searchUnixUser(userName)
@ -3401,8 +3401,8 @@ in Unix service ...") %str(primaryMail))
# Записываем основной почтовый адрес
if not flagError and primaryMail:
if not self.servUnixObj.setUserMail(userName, primaryMail):
self.printERROR(_("Failed set primary email for user %s in\
Unix service ...") %str(primaryMail))
self.printERROR(_("Failed set primary email for user %s in \
Unix service ...") %str(primaryMail))
flagError = True
if not flagError and removeMailDirBack\
and os.path.exists(removeMailDirBack):
@ -3843,7 +3843,7 @@ class servJabber(shareLdap):
if options.has_key('i'):
photoFile = options['i']
if not self.setJpegPhotoUser(userName, photoFile):
self.printERROR(_("Not added jpeg photo for user") + " " +\
self.printERROR(_("Can not add jpeg photo for user") + " " +\
str(userName))
return False
# Изменяемые аттрибуты пользователя
@ -4086,7 +4086,7 @@ class servJabber(shareLdap):
if options.has_key('i'):
photoFile = options['i']
if not self.setJpegPhotoUser(userName, photoFile):
self.printERROR(_("Not added jpeg photo for user") + " " +\
self.printERROR(_("Can not add jpeg photo for user") + " " +\
str(userName))
self.delUserJabberServer(userName, options, False)
return False
@ -4157,7 +4157,7 @@ class servJabber(shareLdap):
else :
self.printERROR(\
_("Command line incorrect, \
'history=%s' - error, to use 'history on' or 'history off'")\
'history=%s' - error, to use 'history on' or 'history off'")\
%str(history) + " ...")
return False
# Cоздаем объект профиль устанавливая директорию jabber для
@ -4438,7 +4438,7 @@ class servSamba(shareLdap):
optUnix['v'] = ""
if not self.servUnixObj.addUserUnixServer(userName, optUnix,
False,userPwd):
self.printERROR (_("Can not added user")+ " " +\
self.printERROR (_("Can not add user")+ " " +\
str(userName) + _(" in Unix service"))
return False
flagCreateUnixUser = True
@ -7535,7 +7535,7 @@ class servFtp(shareLdap):
optUnix['c'] = options['c']
if not self.servUnixObj.addUserUnixServer(userName, optUnix,
False):
self.printERROR (_("Can not added user")+ " " +\
self.printERROR (_("Can not add user")+ " " +\
str(userName) + _(" in Unix service"))
return False
resUnix = self.servUnixObj.searchUnixUser(userName)
@ -7955,7 +7955,7 @@ if %%errorlevel%%==0 NET USE T: \\\\%s\\ftp' %(netbios,netbios,netbios)
if not self.modAttrsDN(DN, modAttrs):
return False
else:
print _("Incorrect added user %s in branch 'Replication'")%userName
print _("Can not add user %s in branch 'Replication'")%userName
return False
return True
@ -8163,7 +8163,7 @@ calculate-server")
0,0)
textLine = self.execProg("crontab %s"%fileNameCron)
if not (textLine == None):
self.printERROR(_("Can not added crontab file"))
self.printERROR(_("Can not add crontab file"))
if os.path.exists(fileNameCron):
os.remove(fileNameCron)
return False
@ -8205,7 +8205,7 @@ calculate-server")
0,0)
textLine = self.execProg("crontab %s"%fileNameCron)
if not (textLine == None):
self.printERROR(_("Can not added crontab file"))
self.printERROR(_("Can not add crontab file"))
if os.path.exists(fileNameCron):
os.remove(fileNameCron)
return False
@ -8220,7 +8220,7 @@ calculate-server")
vesionInst, versionComp = clProf._convertVers(openLdapVesion, "2.4")
if vesionInst <= versionComp:
self.printERROR(_("openldap-%s does not support replication, \
use the new version. (openldap > 2.4)"))
use the new version. (openldap > 2.4)"))
return False
return True
@ -8256,8 +8256,8 @@ calculate-server")
localTime[2],localTime[3],
localTime[4],localTime[5])
if timeLocal < timeFile:
self.printERROR(_("Incorrect system time or time create\
file %s")%bFile)
self.printERROR(_("Incorrect system time or time create \
file %s")%bFile)
return False
deltaTime = timeLocal - timeFile
if deltaTime.days == 0:
@ -8298,13 +8298,13 @@ calculate-server")
if not options.has_key('off') and\
(not options.has_key('r') or not options['r']):
self.printERROR(\
_("Not specified replication servers\
(command line option '-r')") + " ...")
_("Not specified replication servers \
(command line option '-r')") + " ...")
return False
if options.has_key('off') and options.has_key('r'):
self.printERROR(\
_("You can not use the option to '--off',\
together with option '-r'") + " ...")
together with option '-r'") + " ...")
return False
replServers = []
if options.has_key('r'):

Write Preview
Loading…
Cancel
Save