sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

netcmd: Tweak backup-offline output to avoid subunit truncation

Browse Source 
Currently a backup-offline test is occasionally flapping in autobuild,
however, the output is truncated so we can't see what the actual problem
is. The output only ever contains the list of backup dirs. I suspect
that the ']' character printed at the end of the python list might be
getting interpretted by subunit as the end of *all* the output.

If so, we should be able to avoid the problem by printing the list items
without the '['/']'s, i.e. join the list into a single string.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Tim Beale 2018-09-18 15:24:36 +12:00 committed by Andrew Bartlett
parent 08a5fbd867
commit 2055b710ab
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/netcmd/domain_backup.py
View File

@ -917,7 +917,7 @@ class cmd_domain_backup_offline(samba.netcmd.Command):
backup_dirs = [paths.private_dir, paths.state_dir,
os.path.dirname(paths.smbconf)] # etc dir
logger.info('running backup on dirs: {}'.format(backup_dirs))
logger.info('running backup on dirs: {}'.format(' '.join(backup_dirs)))
# Recursively get all file paths in the backup directories
all_files = []