diff --git a/Script/Conf.py b/Script/Conf.py index 46fe979c7eca7fc9cf253547884b187953222aec..1c7d54ca15b4a00721ff9b828aef42242cfb6a6a 100644 --- a/Script/Conf.py +++ b/Script/Conf.py @@ -197,7 +197,7 @@ class Conf: self.DataFilePattern = cfg.DataFilePattern try: - self.ExcludeFileRegex = cfg.DataFilePattern + self.ExcludeFileRegex = cfg.ExcludeFileRegex except AttributeError: self.ExcludeFileRegex = None diff --git a/Script/ManagerThread.py b/Script/ManagerThread.py index 10fedcdb4cc2549972db2dcc2a967009d76ce36b..4b63db52a2227b3094ad80a23fa516df59dcf955 100644 --- a/Script/ManagerThread.py +++ b/Script/ManagerThread.py @@ -13,6 +13,7 @@ import pprint import math import Constants import errno +import re from utils import set_log_level,formatter,thread_id_string from itertools import chain @@ -201,7 +202,7 @@ class ManagerThread(threading.Thread): if not filename in self.CopyFileList: self.logger.debug('New file: %s', filename) - if self.conf.ExcludeFileRegex and re.match(self.conf.ExcludeFileRegex, filename): + if self.conf.ExcludeFileRegex is not None and re.match(self.conf.ExcludeFileRegex, filename): self.logger.debug('ignoring file matching exclude regex: %s', filename) continue diff --git a/Test/test_config.cfg b/Test/test_config.cfg index 678d7e779c0bade4427ee22e1f6b8ea787af4968..1374849f4487e281767a838f9f6c889b355e9cfe 100644 --- a/Test/test_config.cfg +++ b/Test/test_config.cfg @@ -103,9 +103,11 @@ DirList: ['/tmp/atlascdr/'] # Unix pathname pattern for file selection -# FilePattern: ['*.data', '*.out'] DataFilePattern: ['*.data',] +# Regex file exclusion (after selection) +ExcludeFileRegex: None + # Number of files to be deleted before to update the list of files to be copied nDel: 1