aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFélix Sipma <felix+debian@gueux.org>2017-04-25 17:49:12 +0200
committerFélix Sipma <felix+debian@gueux.org>2017-04-25 19:00:19 +0200
commitf199adf7c3f218b22bf0a4af00737ef66ca60f2c (patch)
tree568c159e246fa7c1154f7abe97fd77bcadde8b77
parent1496c396693661bcca4b6214c5cb453dd5648571 (diff)
Update code for pkg xattr v0.2.0 patch
Upstream patch
-rw-r--r--debian/patches/0002-Update-code-for-pkg-xattr-v0.2.0.patch46
-rw-r--r--debian/patches/series1
2 files changed, 47 insertions, 0 deletions
diff --git a/debian/patches/0002-Update-code-for-pkg-xattr-v0.2.0.patch b/debian/patches/0002-Update-code-for-pkg-xattr-v0.2.0.patch
new file mode 100644
index 0000000..e4c4d88
--- /dev/null
+++ b/debian/patches/0002-Update-code-for-pkg-xattr-v0.2.0.patch
@@ -0,0 +1,46 @@
+From: =?utf-8?q?F=C3=A9lix_Sipma?= <felix+debian@gueux.org>
+Date: Tue, 25 Apr 2017 17:45:22 +0200
+Subject: Update code for pkg/xattr v0.2.0
+
+Upstream patch
+---
+ src/restic/node_xattr.go | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/restic/node_xattr.go b/src/restic/node_xattr.go
+index a61c44a..2c117e0 100644
+--- a/src/restic/node_xattr.go
++++ b/src/restic/node_xattr.go
+@@ -12,8 +12,8 @@ import (
+
+ // Getxattr retrieves extended attribute data associated with path.
+ func Getxattr(path, name string) ([]byte, error) {
+- b, e := xattr.Getxattr(path, name)
+- if err, ok := e.(*xattr.XAttrError); ok && err.Err == syscall.ENOTSUP {
++ b, e := xattr.Get(path, name)
++ if err, ok := e.(*xattr.Error); ok && err.Err == syscall.ENOTSUP {
+ return nil, nil
+ }
+ return b, errors.Wrap(e, "Getxattr")
+@@ -22,8 +22,8 @@ func Getxattr(path, name string) ([]byte, error) {
+ // Listxattr retrieves a list of names of extended attributes associated with the
+ // given path in the file system.
+ func Listxattr(path string) ([]string, error) {
+- s, e := xattr.Listxattr(path)
+- if err, ok := e.(*xattr.XAttrError); ok && err.Err == syscall.ENOTSUP {
++ s, e := xattr.List(path)
++ if err, ok := e.(*xattr.Error); ok && err.Err == syscall.ENOTSUP {
+ return nil, nil
+ }
+ return s, errors.Wrap(e, "Listxattr")
+@@ -31,8 +31,8 @@ func Listxattr(path string) ([]string, error) {
+
+ // Setxattr associates name and data together as an attribute of path.
+ func Setxattr(path, name string, data []byte) error {
+- e := xattr.Setxattr(path, name, data)
+- if err, ok := e.(*xattr.XAttrError); ok && err.Err == syscall.ENOTSUP {
++ e := xattr.Set(path, name, data)
++ if err, ok := e.(*xattr.Error); ok && err.Err == syscall.ENOTSUP {
+ return nil
+ }
+ return errors.Wrap(e, "Setxattr")
diff --git a/debian/patches/series b/debian/patches/series
index 0a57a61..44cf5f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Debianize-doc-Manual.md.patch
+0002-Update-code-for-pkg-xattr-v0.2.0.patch