diff options
| author | Alon Levy <alon@pobox.com> | 2015-04-10 14:32:10 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-04-10 14:32:10 +0200 |
| commit | d8b3592e9103db5a8b71fa2c10aa11c694fea9d4 (patch) | |
| tree | 87ab85d62d0028891d788d336438118e01b42612 /src/server | |
| parent | 64436349886c01dcee7b3f168789ba11deb17ae9 (diff) | |
rz_cli: bug fix for --merge-file
Diffstat (limited to 'src/server')
| -rwxr-xr-x | src/server/rz_cli.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/rz_cli.py b/src/server/rz_cli.py index 2c39f451..501b5f85 100755 --- a/src/server/rz_cli.py +++ b/src/server/rz_cli.py @@ -125,6 +125,6 @@ if __name__ == '__main__': merge_sources = args.merge.split(',') if args.merge_file: with open(args.merge_file) as fd: - merge_sources = fd.readlines() + merge_sources = [line.strip() for line in fd.readlines()] if merge_sources: merge(args.merge_target, merge_sources) |