aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFélix Sipma <felix+debian@gueux.org>2016-12-14 12:57:18 +0100
committerFélix Sipma <felix+debian@gueux.org>2016-12-14 12:59:01 +0100
commit656f3a8d6818edc1744c11b29ba7071bb725e22a (patch)
treed9a7afe5311df7be6019485459678d24597aa4e2
parent0e20a6c8069384c71bebaf6552291fcc9dbe1bb9 (diff)
update vendor patch
-rw-r--r--debian/patches/0001-replace-vendor-src-by-usr-share-gocode-src.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/0001-replace-vendor-src-by-usr-share-gocode-src.patch b/debian/patches/0001-replace-vendor-src-by-usr-share-gocode-src.patch
index 02edf26..7b1220d 100644
--- a/debian/patches/0001-replace-vendor-src-by-usr-share-gocode-src.patch
+++ b/debian/patches/0001-replace-vendor-src-by-usr-share-gocode-src.patch
@@ -1,5 +1,5 @@
-From: =?utf-8?q?F=C3=A9lix_Sipma?= <felix.sipma@no-log.org>
-Date: Wed, 30 Nov 2016 13:41:42 +0100
+From: =?utf-8?q?F=C3=A9lix_Sipma?= <felix+debian@gueux.org>
+Date: Wed, 14 Dec 2016 12:58:33 +0100
Subject: replace vendor/src by /usr/share/gocode/src
---
@@ -7,15 +7,15 @@ Subject: replace vendor/src by /usr/share/gocode/src
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.go b/build.go
-index 166aee3..cdf964b 100644
+index 04a65d1..6f223d9 100644
--- a/build.go
+++ b/build.go
-@@ -352,7 +352,7 @@ func main() {
- die("copying files from %v/src/cmds to %v/src/restic/cmds failed: %v\n", root, gopath, err)
+@@ -362,7 +362,7 @@ func main() {
+ die("copying files from %v/src to %v/src failed: %v\n", root, gopath, err)
}
- vendor := filepath.Join(root, "vendor", "src")
+ vendor := filepath.Join("/", "usr", "share", "gocode", "src")
- if err = updateGopath(gopath, vendor, ""); err != nil {
- die("copying files from %v to %v/src failed: %v\n", vendor, gopath, err)
- }
+ if directoryExists(vendor) {
+ if err = updateGopath(gopath, vendor, ""); err != nil {
+ die("copying files from %v to %v failed: %v\n", root, gopath, err)