tags 665028 + patch thanks Dear Laszlo,
I've prepared an NMU for cvs2svn (versioned as 2.3.0-2.1) but *not* yet uploaded. The NMU is based on a upstream commit (r5381) to fix the FTBFS found by upstream on ubuntu. I have verified with sbuild that cvs2svn builds both in wheezy and unstable with that patch. I can prepare the final NMU if needed. Regards. Salvatore
diff -u cvs2svn-2.3.0/debian/changelog cvs2svn-2.3.0/debian/changelog
--- cvs2svn-2.3.0/debian/changelog
+++ cvs2svn-2.3.0/debian/changelog
@@ -1,3 +1,11 @@
+cvs2svn (2.3.0-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Patch run-tests.py with upstream svn diff for revision r5381 to fix
+ failures in tests (Closes: 665028).
+
+ -- Salvatore Bonaccorso <car...@debian.org> Sat, 25 Aug 2012 08:29:59 +0200
+
cvs2svn (2.3.0-2) unstable; urgency=low
* Pass '--prefix=/usr' to 'setup.py install' needed for the upcoming Python
only in patch2:
unchanged:
--- cvs2svn-2.3.0.orig/run-tests.py
+++ cvs2svn-2.3.0/run-tests.py
@@ -3174,19 +3174,15 @@
"verify that --use-internal-co works"
rcs_conv = ensure_conversion(
- 'main', args=['--use-rcs', '--default-eol=native'],
+ 'main', args=['--use-rcs', '--default-eol=native'], dumpfile='use-rcs-rcs.dump',
)
conv = ensure_conversion(
- 'main', args=['--default-eol=native'],
+ 'main', args=['--default-eol=native'], dumpfile='use-rcs-int.dump',
)
if conv.output_found(r'WARNING\: internal problem\: leftover revisions'):
raise Failure()
- rcs_lines = run_program(
- svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
- rcs_conv.repos)
- lines = run_program(
- svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
- conv.repos)
+ rcs_lines = list(open(rcs_conv.dumpfile, 'rb'))
+ lines = list(open(conv.dumpfile, 'rb'))
# Compare all lines following the repository UUID:
if lines[3:] != rcs_lines[3:]:
raise Failure()
@@ -3199,19 +3195,17 @@
rcs_conv = ensure_conversion(
'internal-co',
args=['--use-rcs', '--exclude=BRANCH', '--default-eol=native'],
+ dumpfile='internal-co-exclude-rcs.dump',
)
conv = ensure_conversion(
'internal-co',
args=['--exclude=BRANCH', '--default-eol=native'],
+ dumpfile='internal-co-exclude-int.dump',
)
if conv.output_found(r'WARNING\: internal problem\: leftover revisions'):
raise Failure()
- rcs_lines = run_program(
- svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
- rcs_conv.repos)
- lines = run_program(
- svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
- conv.repos)
+ rcs_lines = list(open(rcs_conv.dumpfile, 'rb'))
+ lines = list(open(conv.dumpfile, 'rb'))
# Compare all lines following the repository UUID:
if lines[3:] != rcs_lines[3:]:
raise Failure()
signature.asc
Description: Digital signature
