File: fix-co-dashv-obsolete.patch

package info (click to toggle)
cvs2svn 2.4.0-2
  • links: PTS
  • area: main
  • in suites: jessie, jessie-kfreebsd
  • size: 3,552 kB
  • ctags: 2,998
  • sloc: python: 22,334; sh: 512; perl: 121; makefile: 84
file content (19 lines) | stat: -rw-r--r-- 821 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
Subject: Use --version instead of obsolete -V to check for co's existence

The --use-rcs option uses 'co -V' to verify that co exists. However, recent
versions of rcs produce a warning on stderr to use --version instead; this
causes a false negative, causing --use-rcs to fail.

Author: Stephen Oberholtzer <stevie@qrpff.net>

--- a/cvs2svn_lib/rcs_revision_manager.py
+++ b/cvs2svn_lib/rcs_revision_manager.py
@@ -29,7 +29,7 @@
   def __init__(self, co_executable):
     self.co_executable = co_executable
     try:
-      check_command_runs([self.co_executable, '-V'], self.co_executable)
+      check_command_runs([self.co_executable, '--version'], self.co_executable)
     except CommandFailedException, e:
       raise FatalError('%s\n'
                        'Please check that co is installed and in your PATH\n'