r41593 - in /trunk/libsys-statistics-linux-perl/debian: changelog patches/fix-empty-wchan.patch

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Mon Aug 10 15:14:55 2009
New Revision: 41593

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=41593
Log:
IGNORE-VERSION: 0.52-3
I don't think this version needs to be uploaded until 0.54 is released
* Updated the patch with the upstream fix in 0.53_01 (RT#48458)

Modified:
    trunk/libsys-statistics-linux-perl/debian/changelog
    trunk/libsys-statistics-linux-perl/debian/patches/fix-empty-wchan.patch

Modified: trunk/libsys-statistics-linux-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/debian/changelog?rev=41593&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/debian/changelog (original)
+++ trunk/libsys-statistics-linux-perl/debian/changelog Mon Aug 10 15:14:55 2009
@@ -1,3 +1,12 @@
+libsys-statistics-linux-perl (0.52-3) UNRELEASED; urgency=low
+
+  IGNORE-VERSION: 0.52-3
+  I don't think this version needs to be uploaded until 0.54 is released
+
+  * Updated the patch with the upstream fix in 0.53_01 (RT#48458)
+
+ -- Jonathan Yu <frequency at cpan.org>  Mon, 10 Aug 2009 07:14:18 -0400
+
 libsys-statistics-linux-perl (0.52-2) unstable; urgency=low
 
   [ Jonathan Yu ]

Modified: trunk/libsys-statistics-linux-perl/debian/patches/fix-empty-wchan.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsys-statistics-linux-perl/debian/patches/fix-empty-wchan.patch?rev=41593&op=diff
==============================================================================
--- trunk/libsys-statistics-linux-perl/debian/patches/fix-empty-wchan.patch (original)
+++ trunk/libsys-statistics-linux-perl/debian/patches/fix-empty-wchan.patch Mon Aug 10 15:14:55 2009
@@ -1,6 +1,7 @@
 Description: Fix FTBFS issues
  When /proc/*/wchan is empty, then the tests fail. This checks if the input
- line is null, and sets it to the empty string if it is.
+ line is null, and sets it to the empty string if it is. Backported the fix
+ applied upstream in version 0.53_01 (development version)
 Origin: vendor
 Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=539984
 Bug-CPAN: https://rt.cpan.org/Ticket/Display.html?id=48458
@@ -8,13 +9,17 @@
 Author: Jonathan Yu <frequency at cpan.org>
 --- a/lib/Sys/Statistics/Linux/Processes.pm
 +++ b/lib/Sys/Statistics/Linux/Processes.pm
-@@ -321,6 +321,9 @@
+@@ -321,7 +321,12 @@
  
          if (open my $fh, '<', "$file->{basedir}/$pid/$file->{wchan}") {
              $stats{$pid}{wchan} = <$fh>;
-+            unless (defined $stats{$pid}{wchan}) {
-+                $stats{$pid}{wchan} = '';
+-            chomp($stats{$pid}{wchan});
++
++            if (defined $stats{$pid}{wchan}) {
++                chomp($stats{$pid}{wchan});
++            } else {
++                $stats{$pid}{wchan} = defined;
 +            }
-             chomp($stats{$pid}{wchan});
          } else {
              delete $stats{$pid};
+             next PID;