[Python-modules-commits] [python-llfuse] 04/16: merge patched into master

[Nikolaus Rath]

This is an automated email from the git hooks/post-receive script.

nikratio-guest pushed a commit to branch master
in repository python-llfuse.

commit 9533be5dcb6d784879f2663eb27bf8d0563c3172
Merge: 57dbc6c 8b3882e
Author: Nikolaus Rath <Nikolaus at rath.org>
Date:   Mon Mar 7 13:34:14 2016 -0800

    merge patched into master

 debian/.git-dpm                                        |  4 ++--
 ...p-extended-attribute-tests-under-GNU-kFreeBSD.patch | 18 +++++++++++++-----
 test/test_api.py                                       |  1 +
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index f8250d1,0000000..f4e0991
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- e599445631b51ff25333e801d27a79ff534071bf
- e599445631b51ff25333e801d27a79ff534071bf
++8b3882e708afeea7c80ca9f24b9802431019b636
++8b3882e708afeea7c80ca9f24b9802431019b636
 +55ca1732373dd9ca6cb7e46c73a401dc3a62ac45
 +55ca1732373dd9ca6cb7e46c73a401dc3a62ac45
 +python-llfuse_0.43+dfsg.orig.tar.gz
 +44342fde1ecdb8d869b0d1577498b627de7d6aec
 +254663
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0007-Skip-extended-attribute-tests-under-GNU-kFreeBSD.patch
index c1a85e8,0000000..2d93ce9
mode 100644,000000..100644
--- a/debian/patches/0007-Skip-extended-attribute-tests-under-GNU-kFreeBSD.patch
+++ b/debian/patches/0007-Skip-extended-attribute-tests-under-GNU-kFreeBSD.patch
@@@ -1,28 -1,0 +1,36 @@@
- From e599445631b51ff25333e801d27a79ff534071bf Mon Sep 17 00:00:00 2001
++From 8b3882e708afeea7c80ca9f24b9802431019b636 Mon Sep 17 00:00:00 2001
 +From: Nikolaus Rath <Nikolaus at rath.org>
 +Date: Mon, 7 Mar 2016 13:22:36 -0800
 +Subject: Skip extended attribute tests under GNU/kFreeBSD
 +
 +Origin: Debian
 +Forwarded: not-needed
 +
 +Under GNU/kFreeBSD the setxattr and getxattr functions are dummies
 +that return ENOTIMPL.
 +---
-  test/test_api.py | 3 ++-
-  1 file changed, 2 insertions(+), 1 deletion(-)
++ test/test_api.py | 4 +++-
++ 1 file changed, 3 insertions(+), 1 deletion(-)
 +
 +diff --git a/test/test_api.py b/test/test_api.py
- index 990b..ec6a 100755
++index 990b..af0f 100755
 +--- a/test/test_api.py
 ++++ b/test/test_api.py
- @@ -58,7 +58,8 @@ def _getxattr_helper(path, name):
++@@ -21,6 +21,7 @@ import tempfile
++ import os
++ import errno
++ import pytest
+++import sys
++ 
++ def test_inquire_bits():
++     assert 0 < llfuse.get_ino_t_bits() < 256
++@@ -58,7 +59,8 @@ def _getxattr_helper(path, name):
 + 
 +     return value
 + 
 +-
 ++ at pytest.mark.skipif(sys.platform.startswith('gnukfreebsd'),
 ++                    reason='GNU/kFreeBSD does not have xattr support')
 + def test_xattr():
 +     with tempfile.NamedTemporaryFile() as fh:
 +         key = 'user.new_attribute'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-llfuse.git