Commit 139a0dd3 authored by BODERE's avatar BODERE
Browse files

Merge branch 'hotfix_6.0.15' into 'master'

Hotfix 6.0.15

Closes #73

See merge request downloader/downloader_daemon!47
parents 9dfe0254 7ee142af
......@@ -100,6 +100,8 @@ class ConfigurationFileUtil(object):
self.__xr = xmlReader
self.__xmltree = xmltree
self.__debug = None
def Read(self):
ConfigSource = False
......@@ -117,6 +119,10 @@ class ConfigurationFileUtil(object):
"the node '%s' don't have the required attribute '%s'" %
(xmlNode.tag, 'id'))
self.__debug = False
if self.__xr.haveSubNode(xmlNode, 'debug'):
self.__debug = True
if self.__xr.haveSubNode(xmlNode, 'data_source'):
sourceNode = self.__xr.getSubNode(
logging.ERROR, xmlNode, 'data_source')
......@@ -148,6 +154,7 @@ class ConfigurationFileUtil(object):
raise IOError
id = property(lambda self: self.__id, None, None, "read only id variable")
debug = property(lambda self: self.__debug, None, None, "read only debug variable")
source = property(lambda self: self.__source, None,
None, "read only source variable")
destination = property(
......
......@@ -883,7 +883,7 @@ class Download(threading.Thread):
else:
self.__listing_builder.setConfiguration(
self.__configuration.source.update)
self.__listing_builder.setModeDebug(self.__verbose)
self.__listing_builder.setModeDebug(True if self.__configuration.debug else self.__verbose)
self._log.debug(" --> configure DataReader")
try:
......@@ -1290,7 +1290,7 @@ class Download(threading.Thread):
fileMap = {}
for line in lines:
line_infos = line.split(',')
line_infos = line.split(', ')
filepath = line_infos[0].strip()
if filepath == '':
......
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