From 569e61f1f7092f1e67855f9ebef2b79a30cfc5b0 Mon Sep 17 00:00:00 2001 From: mhagger Date: Thu, 15 Dec 2011 04:46:48 +0000 Subject: [PATCH] verify-cvs2svn.py: Fix \n vs \r\n issue under Windows. Split lines in command output using os.linesep, rather than always using LF. Patch by: Nicolas Goffinet git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5362 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- contrib/verify-cvs2svn.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/verify-cvs2svn.py b/contrib/verify-cvs2svn.py index f660c646..a3d4d820 100755 --- a/contrib/verify-cvs2svn.py +++ b/contrib/verify-cvs2svn.py @@ -158,7 +158,7 @@ class SvnRepos: if status: cmd_failed(cmd, output, status) entries = [] - for line in output.split("\n"): + for line in output.split(os.linesep): if line: entries.append(line[:-1]) return entries @@ -205,7 +205,7 @@ class HgRepos: (output, status) = pipe(cmd) if status: cmd_failed(cmd, output, status) - manifest = [fn for fn in output.split("\n")[:-1] + manifest = [fn for fn in output.split(os.linesep)[:-1] if not fn.startswith('.hg')] if not manifest: os.mkdir(dest_path) @@ -246,7 +246,7 @@ class HgRepos: (output, status) = pipe(cmd) if status: cmd_failed(cmd, output, status) - return output.split("\n")[:-1] + return output.split(os.linesep)[:-1] class GitRepos: @@ -344,7 +344,7 @@ class GitRepos: (output, status) = pipe(cmd) if status: cmd_failed(cmd, output, status) - return output.split("\n")[:-1] + return output.split(os.linesep)[:-1] def transform_symbol(ctx, name): @@ -408,7 +408,7 @@ def file_compare(failures, base1, base2, run_diff, rel_path): if run_diff: cmd = ['diff', '-u', path1, path2] (output, status) = pipe(cmd) - diff = output.split('\n') + diff = output.split(os.linesep) else: diff = None failures.report('File contents differ for %s' % rel_path, -- 2.11.4.GIT