[Python-apps-commits] r11078 - in packages/s3ql/trunk/debian (4 files)

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

    Date: Sunday, July 20, 2014 @ 03:42:43
  Author: nikratio-guest
Revision: 11078

Cherry-picked upstream patch to support testing with C
locale.

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

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2014-07-20 03:27:30 UTC (rev 11077)
+++ packages/s3ql/trunk/debian/changelog	2014-07-20 03:42:43 UTC (rev 11078)
@@ -2,6 +2,8 @@
 
   * Cherry-picked kFreeBSD compatibility patch from upstream
     (Closes: #755358)
+  * Cherry-picked upstream patch to support testing with C
+    locale.
 
  -- Nikolaus Rath <Nikolaus at rath.org>  Sat, 19 Jul 2014 20:24:55 -0700
 

Added: packages/s3ql/trunk/debian/patches/C_locale_compat.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/C_locale_compat.diff	                        (rev 0)
+++ packages/s3ql/trunk/debian/patches/C_locale_compat.diff	2014-07-20 03:42:43 UTC (rev 11078)
@@ -0,0 +1,17 @@
+Description: Fix unit test failure under C locale
+Origin: https://bitbucket.org/nikratio/s3ql/commits/f6c1d2d91f59
+Forwarded: not-needed
+Last-Update: <2014-07-19>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
+--- a/tests/common.py
++++ b/tests/common.py
+@@ -224,7 +233,7 @@
+     file_sizes.append(int(0.5 * size))
+ 
+     # Special characters for use in filenames
+-    special_chars = [ chr(x) for x in range(256)
++    special_chars = [ chr(x) for x in range(128)
+                       if x not in (0, ord('/')) ]
+ 
+     def random_name(path):

Modified: packages/s3ql/trunk/debian/patches/kfreebsd_compat.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/kfreebsd_compat.diff	2014-07-20 03:27:30 UTC (rev 11077)
+++ packages/s3ql/trunk/debian/patches/kfreebsd_compat.diff	2014-07-20 03:42:43 UTC (rev 11078)
@@ -1,14 +1,11 @@
+Description: Fix unit test failure under kFreeBSD
+Origin: https://bitbucket.org/nikratio/s3ql/commits/412b308e4d33
+Forwarded: not-needed
+Last-Update: <2014-07-19>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
 --- 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:

Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series	2014-07-20 03:27:30 UTC (rev 11077)
+++ packages/s3ql/trunk/debian/patches/series	2014-07-20 03:42:43 UTC (rev 11078)
@@ -1,5 +1,6 @@
-kfreebsd_compat.diff
 proc_mount.diff
 clock-granularity.diff
 sphinx_build_locale_fix.diff
 check_dev_fuse_perms.diff
+C_locale_compat.diff
+kfreebsd_compat.diff