Mercurial > cvs2svn
changeset 79:d79a9c0c045e
verify-cvs2svn: factor out cmd_failed() function.
| author | Greg Ward <greg@gerg.ca> |
|---|---|
| date | Fri, 31 Jul 2009 18:19:46 -0400 |
| parents | 5991b868c571 |
| children | 018436f39d73 |
| files | contrib/verify-cvs2svn.py |
| diffstat | 1 files changed, 9 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/verify-cvs2svn.py +++ b/contrib/verify-cvs2svn.py @@ -50,6 +50,12 @@ status = child.wait() return (output, status) +def cmd_failed(cmd, output, status): + print 'CMD FAILED:', ' '.join(cmd) + print 'Output:' + sys.stdout.write(output) + raise RuntimeError('%s command failed!' % cmd[0]) + class CvsRepos: def __init__(self, path): """Open the CVS repository at PATH.""" @@ -84,10 +90,7 @@ cmd.extend([ '-d', dest_path, self.module ]) (output, status) = pipe(cmd) if status or output: - print 'CMD FAILED:', ' '.join(cmd) - print 'Output:' - sys.stdout.write(output) - raise RuntimeError('CVS command failed!') + cmd_failed(cmd, output, status) class SvnRepos: @@ -112,10 +115,7 @@ cmd = [ SVN_CMD, 'export', '-q', url, dest_path ] (output, status) = pipe(cmd) if status or output: - print 'CMD FAILED:', ' '.join(cmd) - print 'Output:' - sys.stdout.write(output) - raise RuntimeError('SVN command failed!') + cmd_failed(cmd, output, status) def export_trunk(self, dest_path): """Export trunk to DEST_PATH.""" @@ -134,10 +134,7 @@ cmd = [ SVN_CMD, 'ls', self.url + '/' + path ] (output, status) = pipe(cmd) if status: - print 'CMD FAILED:', ' '.join(cmd) - print 'Output:' - sys.stdout.write(output) - raise RuntimeError('SVN command failed!') + cmd_failed(cmd, output, status) entries = [] for line in output.split("\n"): if line: