[SCM] Debian packaging of libcvs-perl branch, master, updated. ceb4a0577c17ba73db3a14d7d7cb2c15caa42168

gregor herrmann gregoa at debian.org
Tue Mar 27 21:51:02 UTC 2012


The following commit has been merged in the master branch:
commit 3c5c6cb3e8dc20f05bc4841027f2bfbcc833cc96
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Mar 27 23:00:47 2012 +0200

    Add patch to properly handle incomplete lines when looking for a linefeed.
    
    Closes: #661799
    Thanks: Niko Tyni for the analysis and the patch.

diff --git a/debian/patches/0001-Properly-handle-incomplete-lines-when-looking-for-a-.patch b/debian/patches/0001-Properly-handle-incomplete-lines-when-looking-for-a-.patch
new file mode 100644
index 0000000..443dad2
--- /dev/null
+++ b/debian/patches/0001-Properly-handle-incomplete-lines-when-looking-for-a-.patch
@@ -0,0 +1,31 @@
+From ef84257ce9b0e17eddea6031112a563fb321be65 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Tue, 27 Mar 2012 22:00:34 +0300
+Subject: [PATCH] Properly handle incomplete lines when looking for a linefeed
+
+The test suite occasionally fails on loaded hosts when the output from
+the 'cvs' command comes in incomplete lines and the analyzer is looking
+for a linefeed.
+
+The fix is not to throw lone linefeeds away when an unmatched line is
+being analyzed.
+---
+ lib/Cvs/Command/Base.pm |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/Cvs/Command/Base.pm b/lib/Cvs/Command/Base.pm
+index 73b06c8..9f6d64f 100644
+--- a/lib/Cvs/Command/Base.pm
++++ b/lib/Cvs/Command/Base.pm
+@@ -162,7 +162,7 @@ sub run
+             }
+ 
+             # don't analyse empty lines, but $line have to be set
+-            next if $line =~ /^\n*$/;
++            next if $line =~ /^\n*$/ and !defined $last;
+ 
+             # Analysing the line: if a context is return, we replace
+             # the current one with it to handling context
+-- 
+1.7.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index c8825ee..3aa65e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 pods.patch
+0001-Properly-handle-incomplete-lines-when-looking-for-a-.patch

-- 
Debian packaging of libcvs-perl



More information about the Pkg-perl-cvs-commits mailing list