[Python-apps-commits] r8811 - in packages/hellanzb/trunk/debian (3 files)

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

    Date: Friday, June 1, 2012 @ 04:25:28
  Author: dandrimont-guest
Revision: 8811

Add patch to fix lockups on CRC mismatches

Added:
  packages/hellanzb/trunk/debian/patches/009-Fix_lockup_on_CRC_mismatch.patch
Modified:
  packages/hellanzb/trunk/debian/changelog
  packages/hellanzb/trunk/debian/patches/series

Modified: packages/hellanzb/trunk/debian/changelog
===================================================================
--- packages/hellanzb/trunk/debian/changelog	2012-06-01 04:23:53 UTC (rev 8810)
+++ packages/hellanzb/trunk/debian/changelog	2012-06-01 04:25:28 UTC (rev 8811)
@@ -9,8 +9,9 @@
     - Drop the dpatch build-dependency and dpatch-related targets
     - Drop README.source
   * Add patch from Emil Mikulic to support Twisted 11.1.0+ (Closes: #653294)
+  * Add patch from upstream to fix a potential lockup on CRC mismatches (Closes: #549124)
 
- -- Nicolas Dandrimont <nicolas.dandrimont at crans.org>  Fri, 01 Jun 2012 06:22:08 +0200
+ -- Nicolas Dandrimont <nicolas.dandrimont at crans.org>  Fri, 01 Jun 2012 06:24:48 +0200
 
 hellanzb (0.13-6.1) unstable; urgency=low
 

Added: packages/hellanzb/trunk/debian/patches/009-Fix_lockup_on_CRC_mismatch.patch
===================================================================
--- packages/hellanzb/trunk/debian/patches/009-Fix_lockup_on_CRC_mismatch.patch	                        (rev 0)
+++ packages/hellanzb/trunk/debian/patches/009-Fix_lockup_on_CRC_mismatch.patch	2012-06-01 04:25:28 UTC (rev 8811)
@@ -0,0 +1,30 @@
+Subject: Fix a potential lockup on CRC mismatches
+Author: Philip Jenvey <pjenvey at underboss.org>
+Date:   Tue Apr 3 02:22:29 2007 +0000
+
+    fixed a potential lockup with multiple defineServers that occurs
+    when an article does not exist on one server and failed the CRC check
+    on another server (thanks jon at sd - 6, others)
+    fixes #303
+
+Origin: https://github.com/pjenvey/hellanzb/commit/9dcf91bcd714030ac5fd3f6d464e6c60172a3951
+Bug-Debian: http://bugs.debian.org/549124
+
+---
+
+diff --git a/Hellanzb/NZBLeecher/ArticleDecoder.py b/Hellanzb/NZBLeecher/ArticleDecoder.py
+index d903be0..317318f 100644
+--- a/Hellanzb/NZBLeecher/ArticleDecoder.py
++++ b/Hellanzb/NZBLeecher/ArticleDecoder.py
+@@ -136,6 +136,10 @@ def crcFailedRequeue(segment, encodingMessage):
+             failedFiles = []
+             for serverPoolName in segment.failedServerPools:
+                 failedFile = segment.getDestination() + '-hellafailed_%s' % serverPoolName
++                if not os.path.exists(failedFile):
++                    # Failed files won't exist in the case the server reported
++                    # the article as missing
++                    continue
+                 failedFiles.append((os.path.getsize(failedFile), failedFile))
+             failedFiles.sort()
+             useFile = failedFiles.pop()[1]
+

Modified: packages/hellanzb/trunk/debian/patches/series
===================================================================
--- packages/hellanzb/trunk/debian/patches/series	2012-06-01 04:23:53 UTC (rev 8810)
+++ packages/hellanzb/trunk/debian/patches/series	2012-06-01 04:25:28 UTC (rev 8811)
@@ -7,4 +7,5 @@
 006-Fix_embedded_nzb_postprocessing.patch
 007-Twisted_10.0.0_compat.patch
 008-Twisted_11.1.0_compat.patch
+009-Fix_lockup_on_CRC_mismatch.patch
 100-python_26_fixes.patch