From c7662795f519d2b6797e4b1ac7fa4a22afa26310 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Thu, 27 Jul 2006 23:18:35 +0000
Subject: * merge - This is my current patch queue. I think that all of these
 are safe   to apply. This is just under half of the pending changes in  
 chris/general (the easy half).

---
 test/backupstorefix/testfiles/testbackupstorefix.pl.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'test/backupstorefix')

diff --git a/test/backupstorefix/testfiles/testbackupstorefix.pl.in b/test/backupstorefix/testfiles/testbackupstorefix.pl.in
index b57f10ac..e64474f0 100755
--- a/test/backupstorefix/testfiles/testbackupstorefix.pl.in
+++ b/test/backupstorefix/testfiles/testbackupstorefix.pl.in
@@ -54,7 +54,7 @@ elsif($ARGV[0] eq 'check')
 	open INITIAL,'testfiles/initial-listing.txt' or die "Can't open original listing";
 	while(<INITIAL>)
 	{
-		chomp;
+		chomp; s/\r//;
 		$expected{$_} = 1;
 		m/\A(.+?) .+? (.+)\Z/;
 		$filenames{$2} = $_;
@@ -99,7 +99,7 @@ elsif($ARGV[0] eq 'check')
 	while(<LISTING>)
 	{
 		print LISTING_COPY;
-		chomp;
+		chomp; s/\r//;
 		s/\[FILENAME NOT ENCRYPTED\]//;
 		if(exists $expected{$_})
 		{
-- 
cgit v1.2.3