FIX: fixed multiple typos

master 3.7.2.2
idziubenko 2 years ago
parent 2ffc59f626
commit a3e3b179b7

@ -1433,11 +1433,12 @@ class Client(commandServer, encrypt, Desktop):
pathConfig = os.path.join(userHome, pathConfig = os.path.join(userHome,
self.pathConfig) self.pathConfig)
try: try:
if iniParser(configFileName).setVar( if iniParser(pathConfig).setVar(
'rsync', {'exitcode': rsync.getExitCode()}): 'rsync', {'exitcode': rsync.getExitCode()}):
os.chmod(configFileName, 0o600) os.chmod(pathConfig, 0o600)
os.chown(configFileName, uid, gid) os.chown(pathConfig, uid, gid)
except Exception: except Exception:
pass pass
if ps.exitstatus != 0: if ps.exitstatus != 0:

@ -296,7 +296,8 @@ class ClClientSyncLoginAction(Action):
{'name': 'newsync:domain_sync2', {'name': 'newsync:domain_sync2',
'method': 'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"process")', 'method': 'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"process")',
'condition': lambda Get: Get('cl_client_sync') == 'on', 'condition': lambda Get: Get('cl_client_sync') == 'on',
}, ] + old_sync + new_sync + [ # }, ] + old_sync + new_sync + [
}, ] + old_sync + [
# распаковать ссылки # распаковать ссылки
{'name': 'unpack_links', {'name': 'unpack_links',
'method': 'Client.unpackLinks(ur_home_path)', 'method': 'Client.unpackLinks(ur_home_path)',

@ -664,7 +664,7 @@ class SyncHelper():
cpRemote.read_string(iniEnvRemoteData) cpRemote.read_string(iniEnvRemoteData)
xSessionCur = cpCur.get('main', 'xsession', fallback=None) xSessionCur = cpCur.get('main', 'xsession', fallback=None)
xSessionThis = cpThis.get('main', 'xsession', fallback=None) xSessionThis = cpRemote.get('main', 'xsession', fallback=None)
if curStatusSync == "success_logout" and \ if curStatusSync == "success_logout" and \
xSessionCur == xSessionThis: xSessionCur == xSessionThis:
thisTimeObj = self.getSyncDate(osLinuxShort, ps) thisTimeObj = self.getSyncDate(osLinuxShort, ps)
@ -749,6 +749,11 @@ class VariableClClientSyncReplicationSet(SyncHelper, ReadonlyVariable):
remotehost = self.Get(self.host_varname) remotehost = self.Get(self.host_varname)
ps = ProfileSyncer(remotehost, 2009, user, pwd) ps = ProfileSyncer(remotehost, 2009, user, pwd)
#there was a typo before - profilePath was missing
profilePath = self.Select('cl_client_user_mount_path',
where='cl_client_user_mount_name',
eq=self.profile_type, limit=1)
if ps.check(): if ps.check():
return "on" if self.checkNeedSyncNew( return "on" if self.checkNeedSyncNew(
self.Get('ur_home_path'), profilePath, self.Get('ur_home_path'), profilePath,

Loading…
Cancel
Save