[Python-apps-commits] r11077 - in packages/s3ql/trunk/debian (3 files)

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

    Date: Sunday, July 20, 2014 @ 03:27:30
  Author: nikratio-guest
Revision: 11077

Cherry-picked kFreeBSD compatibility patch from upstream
(Closes: #755358)

Added:
  packages/s3ql/trunk/debian/patches/kfreebsd_compat.diff
Modified:
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/patches/series

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2014-07-19 11:40:36 UTC (rev 11076)
+++ packages/s3ql/trunk/debian/changelog	2014-07-20 03:27:30 UTC (rev 11077)
@@ -1,3 +1,10 @@
+s3ql (2.9+dfsg-2) UNRELEASED; urgency=medium
+
+  * Cherry-picked kFreeBSD compatibility patch from upstream
+    (Closes: #755358)
+
+ -- Nikolaus Rath <Nikolaus at rath.org>  Sat, 19 Jul 2014 20:24:55 -0700
+
 s3ql (2.9+dfsg-1) unstable; urgency=medium
 
   * New upstream release.

Added: packages/s3ql/trunk/debian/patches/kfreebsd_compat.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/kfreebsd_compat.diff	                        (rev 0)
+++ packages/s3ql/trunk/debian/patches/kfreebsd_compat.diff	2014-07-20 03:27:30 UTC (rev 11077)
@@ -0,0 +1,20 @@
+--- a/tests/mock_server.py
++++ b/tests/mock_server.py
+@@ -2,7 +2,7 @@
+ '''
+ mock_server.py - this file is part of S3QL (http://s3ql.googlecode.com)
+ 
+-Copyright (C) Nikolaus Rath <Nikolaus at rath.org>
++Copyright © 2008 Nikolaus Rath <Nikolaus.org>
+ 
+ This program can be distributed under the terms of the GNU GPLv3.
+ '''
+@@ -80,7 +80,7 @@
+                 pass
+             else:
+                 raise
+-        except BrokenPipeError:
++        except (BrokenPipeError, ConnectionResetError):
+             pass
+ 
+     def do_DELETE(self):

Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series	2014-07-19 11:40:36 UTC (rev 11076)
+++ packages/s3ql/trunk/debian/patches/series	2014-07-20 03:27:30 UTC (rev 11077)
@@ -1,3 +1,4 @@
+kfreebsd_compat.diff
 proc_mount.diff
 clock-granularity.diff
 sphinx_build_locale_fix.diff