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

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

    Date: Wednesday, August 12, 2015 @ 22:01:40
  Author: nikratio-guest
Revision: 12235

* New upstream release.
* Dropped patches/check_dev_fuse_perms.diff (integrated upstream).

Modified:
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/patches/series
Deleted:
  packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2015-08-12 14:50:10 UTC (rev 12234)
+++ packages/s3ql/trunk/debian/changelog	2015-08-12 22:01:40 UTC (rev 12235)
@@ -1,3 +1,10 @@
+s3ql (2.14+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Dropped patches/check_dev_fuse_perms.diff (integrated upstream).
+
+ -- Nikolaus Rath <Nikolaus at rath.org>  Wed, 12 Aug 2015 14:57:22 -0700
+
 s3ql (2.13+dfsg-2) unstable; urgency=medium
 
   * Tighten dependency on python3-dugong, python3-apsw, and

Deleted: packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff	2015-08-12 14:50:10 UTC (rev 12234)
+++ packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff	2015-08-12 22:01:40 UTC (rev 12235)
@@ -1,27 +0,0 @@
-Description: Skip tests requiring FUSE if we can't open /dev/fuse
-Origin: debian
-Forwarded: no
-Last-Update: <2014-07-11>
-Author: Nikolaus Rath <Nikolaus at rath.org>
-
-The machines running the debci continuous integration tests seem
-to have an unusual configuration where /bin/fusermount is setuid
-root, but /dev/fuse has 0600 permissions. If this is the case,
-we need to skip tests that require FUSE.
-
---- a/tests/common.py
-+++ b/tests/common.py
-@@ -130,6 +130,13 @@
-     else:
-         os.close(fd)
- 
-+    try:
-+        fd = os.open('/dev/fuse', os.O_RDWR)
-+    except PermissionError:
-+        raise unittest.SkipTest('No permission to access /dev/fuse') from None
-+    else:
-+        os.close(fd)
-+
- def skip_without_rsync():
-     try:
-         with open('/dev/null', 'wb') as null:

Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series	2015-08-12 14:50:10 UTC (rev 12234)
+++ packages/s3ql/trunk/debian/patches/series	2015-08-12 22:01:40 UTC (rev 12235)
@@ -1,3 +1,2 @@
 proc_mount.diff
 clock-granularity.diff
-check_dev_fuse_perms.diff