Commit dafeb5cb authored by BODERE's avatar BODERE
Browse files

Merge branch 'hotfix_6.0.5' into 'master'

Hotfix 6.0.5

See merge request downloader/downloader_daemon!29
parents 70713e4a a0516f93
......@@ -233,20 +233,14 @@ class SynchronisationLocalRemote(object):
configuration.source.directories_ignoreRegexp)
# Listing Builder plugin dreport
plugins_config_path = self.__globalConfig.getPath("static_plugins")
dreport_plugins_path = os.path.join(plugins_config_path, "dcheckreport")
if configuration.source.update in ("modified", "new"):
# normal configuration => source/selection/update
plugin = "dreport_" + configuration.source.update + "_files.py"
elif configuration.source.update is None:
# normal configuration => source/selection/update
plugin = "dreport_modified_files.py"
plugins_config_path = self.__globalConfig.getPath("dynamic_plugins")
if configuration.source.update is None:
dreport_config_name = "dreport_modified_files.py"
else:
# special configuration => source/selection/update
plugin = "dreport_" + configuration.source.update + "_files.py"
self.remote_dreport_config = os.path.join(dreport_plugins_path, plugin)
dreport_config_name = "dreport_" + configuration.source.update + "_files.py"
self.remote_dreport_config = os.path.join(plugins_config_path, dreport_config_name)
if not os.path.isfile(self.remote_dreport_config):
raise IOError(" Unknown dreport configuration file : '%s'." % (self.remote_dreport_config))
raise IOError(f" Unknown dreport configuration file : '{self.remote_dreport_config}'.")
modulepath = self.remote_dreport_config[:-3]
(moddir, modname) = os.path.split(modulepath)
......@@ -327,9 +321,11 @@ class SynchronisationLocalRemote(object):
def getRemoteUrl(self):
self.__remote_url = ""
if self.__remote_storage_type in ['Ftp', 'Sftp', 'Webdav']:
if self.__remote_storage_type in ['Ftp', 'Ftps', 'Sftp', 'Webdav']:
if self.__remote_storage_type == 'Ftp':
self.__remote_url += 'ftp://'
elif self.__remote_storage_type == 'Ftps':
self.__remote_url += 'ftps://'
elif self.__remote_storage_type == 'Sftp':
self.__remote_url += 'sftp://'
elif self.__remote_storage_type == 'Webdav':
......
......@@ -8,3 +8,4 @@ cffi>=1.0.0
requests~=2.21.0
pika~=1.1.0
elasticsearch~=6.4
urllib3<=1.24.3
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment