merge 389481 385891
tags 385891 patch
thanks
Since linda 0.3.24, Collector uses '::' as the field separator given to
file (file -F "::"). This was change to deal with file containing ': '.
I propose to use a less probable separator like
"improbable_linda_separator: "
A patch is attached.
Kind Regards,
--
Nekral
diff -rauN ../orig/linda-0.3.24/collector.py ./linda-0.3.24/collector.py
--- ../orig/linda-0.3.24/collector.py 2006-08-04 10:17:49.000000000 +0200
+++ ./linda-0.3.24/collector.py 2006-10-15 15:10:16.000000000 +0200
@@ -48,12 +48,12 @@
file_output = []
for list in filter(None, lists_to_run):
try:
- file_output.append(run_external_cmd('file -F "::" %s' % list))
+ file_output.append(run_external_cmd('file -F
"improbable_linda_separator: " %s' % list))
except ExtCmdException:
dprint(_('Failed to run %s') % list, 2)
for output in file_output:
for line in output.split('\n'):
- split_line = line.split('::')
+ split_line = line.split('improbable_linda_separator: ')
cur_file = re.sub('%s/' % self.lab, '', split_line[0].strip())
self.output['file'][cur_file] = split_line[1].strip()
