[Python-apps-commits] r11692 - in packages/s3ql/trunk/debian (5 files)

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

    Date: Sunday, February 1, 2015 @ 04:39:03
  Author: nikratio-guest
Revision: 11692

* New upstream release.
* Dropped patches/fix_test_check_objects_temp.diff (fixed upstream).
* Dropped patches/debug_test_thread_hang.diff (fixed upstream).
* Fixed a bug that caused fsck.s3ql to either abort with a
  "apsw.ConstraintError" or to incorrectly consider storage objects
  as missing when the connection to remote server is interrupted
  while retrieving the object list. Closes: #771452.
* Fixed a problem where mount.s3ql would crash when unmouting the
  file system because it could not delete the cache directory. This
  could happen when the file system was not unmounted cleanly, but
  fsck.s3ql was then run on a different system (or using a different
  cache directory). Closes: #772052.

Modified:
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/control
  packages/s3ql/trunk/debian/patches/series
Deleted:
  packages/s3ql/trunk/debian/patches/debug_test_thread_hang.diff
  packages/s3ql/trunk/debian/patches/fix_test_check_objects_temp.diff

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2015-01-31 18:18:10 UTC (rev 11691)
+++ packages/s3ql/trunk/debian/changelog	2015-02-01 04:39:03 UTC (rev 11692)
@@ -1,3 +1,20 @@
+s3ql (2.13+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Dropped patches/fix_test_check_objects_temp.diff (fixed upstream).
+  * Dropped patches/debug_test_thread_hang.diff (fixed upstream).
+  * Fixed a bug that caused fsck.s3ql to either abort with a
+    "apsw.ConstraintError" or to incorrectly consider storage objects
+    as missing when the connection to remote server is interrupted
+    while retrieving the object list. Closes: #771452.
+  * Fixed a problem where mount.s3ql would crash when unmouting the
+    file system because it could not delete the cache directory. This
+    could happen when the file system was not unmounted cleanly, but
+    fsck.s3ql was then run on a different system (or using a different
+    cache directory). Closes: #772052.
+
+ -- Nikolaus Rath <Nikolaus at rath.org>  Sat, 31 Jan 2015 20:16:12 -0800
+
 s3ql (2.12+dfsg-2) experimental; urgency=medium
 
   * Added patches/debug_test_thread_hang.diff to debug occasional test

Modified: packages/s3ql/trunk/debian/control
===================================================================
--- packages/s3ql/trunk/debian/control	2015-01-31 18:18:10 UTC (rev 11691)
+++ packages/s3ql/trunk/debian/control	2015-02-01 04:39:03 UTC (rev 11692)
@@ -15,7 +15,7 @@
                python3-llfuse (>= 0.39),
                python3-crypto,
                python3-requests,
-               python3-dugong (>= 3.3),
+               python3-dugong (>= 3.4),
                python3-pytest (>= 2.3.3),
                python3-defusedxml,
                cython3 (>= 0.17),

Deleted: packages/s3ql/trunk/debian/patches/debug_test_thread_hang.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/debug_test_thread_hang.diff	2015-01-31 18:18:10 UTC (rev 11691)
+++ packages/s3ql/trunk/debian/patches/debug_test_thread_hang.diff	2015-02-01 04:39:03 UTC (rev 11692)
@@ -1,28 +0,0 @@
-Description: Print debugging information if test_thread_hang hangs
-Origin: upstream
-Forwarded: not-needed
-Last-Update: <2014-11-10>
-Author: Nikolaus Rath <Nikolaus at rath.org>
-
-This patch should help upstream debug a test hang on the buildds
-when it occurs (it seems to be sporadic).
-
---- a/tests/t2_block_cache.py
-+++ b/tests/t2_block_cache.py
-@@ -34,6 +34,7 @@
- import unittest
- import queue
- import pytest
-+import faulthandler
- 
- # A dummy removal queue to monkeypatch around the need for removal and upload
- # threads
-@@ -115,6 +116,8 @@
-         os.unlink(self.dbfile.name)
- 
-     def test_thread_hang(self):
-+        faulthandler.dump_traceback_later(300)
-+
-         # Make sure that we don't deadlock if uploads threads or removal
-         # threads have died and we try to expire or terminate
- 

Deleted: packages/s3ql/trunk/debian/patches/fix_test_check_objects_temp.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/fix_test_check_objects_temp.diff	2015-01-31 18:18:10 UTC (rev 11691)
+++ packages/s3ql/trunk/debian/patches/fix_test_check_objects_temp.diff	2015-02-01 04:39:03 UTC (rev 11692)
@@ -1,19 +0,0 @@
-Description: Fix test_check_objects_temp
-Origin: upstream, commit 746f6ce67056.
-Forwarded: not-needed
-Last-Update: <2014-11-10>
-Author: Nikolaus Rath <Nikolaus at rath.org>
-
-check_objects_temp(): take into account that thread id may be negative.
-
---- a/src/s3ql/fsck.py
-+++ b/src/s3ql/fsck.py
-@@ -873,7 +873,7 @@
- 
-         for (path, dirnames, filenames) in os.walk(plain_backend.prefix, topdown=True):
-             for name in filenames:
--                if not re.search(r'^[^#]+#[0-9]+-[0-9]+\.tmp$', name):
-+                if not re.search(r'^[^#]+#[0-9]+--?[0-9]+\.tmp$', name):
-                     continue
- 
-                 self.found_errors = True

Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series	2015-01-31 18:18:10 UTC (rev 11691)
+++ packages/s3ql/trunk/debian/patches/series	2015-02-01 04:39:03 UTC (rev 11692)
@@ -1,5 +1,3 @@
-debug_test_thread_hang.diff
-fix_test_check_objects_temp.diff
 proc_mount.diff
 clock-granularity.diff
 check_dev_fuse_perms.diff