From 911a78ce6dc2ebe0568073d4459d1e99ad497f5c Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Mon, 19 Mar 2018 16:37:40 +0000 Subject: [PATCH] sftp: require go1.8+ after github.com/pkg/sftp update --- backend/sftp/sftp.go | 2 +- backend/sftp/sftp_internal_test.go | 2 ++ backend/sftp/sftp_test.go | 3 +++ backend/sftp/sftp_unsupported.go | 2 +- backend/sftp/stringlock.go | 2 ++ backend/sftp/stringlock_test.go | 2 ++ fstest/fstests/gen_tests.go | 2 +- 7 files changed, 12 insertions(+), 3 deletions(-) diff --git a/backend/sftp/sftp.go b/backend/sftp/sftp.go index 4b481a206..dc8384e3f 100644 --- a/backend/sftp/sftp.go +++ b/backend/sftp/sftp.go @@ -1,6 +1,6 @@ // Package sftp provides a filesystem interface using github.com/pkg/sftp -// +build !plan9 +// +build !plan9,go1.8 package sftp diff --git a/backend/sftp/sftp_internal_test.go b/backend/sftp/sftp_internal_test.go index 5b5f6feb3..80a75b8e9 100644 --- a/backend/sftp/sftp_internal_test.go +++ b/backend/sftp/sftp_internal_test.go @@ -1,3 +1,5 @@ +// +build !plan9,go1.8 + package sftp import ( diff --git a/backend/sftp/sftp_test.go b/backend/sftp/sftp_test.go index 926267892..232720e0b 100644 --- a/backend/sftp/sftp_test.go +++ b/backend/sftp/sftp_test.go @@ -2,6 +2,9 @@ // // Automatically generated - DO NOT EDIT // Regenerate with: make gen_tests + +// +build !plan9,go1.8 + package sftp_test import ( diff --git a/backend/sftp/sftp_unsupported.go b/backend/sftp/sftp_unsupported.go index daddf483b..e3d09e48e 100644 --- a/backend/sftp/sftp_unsupported.go +++ b/backend/sftp/sftp_unsupported.go @@ -1,6 +1,6 @@ // Build for sftp for unsupported platforms to stop go complaining // about "no buildable Go source files " -// +build plan9 +// +build plan9 !go1.8 package sftp diff --git a/backend/sftp/stringlock.go b/backend/sftp/stringlock.go index c90e29d95..157ee362b 100644 --- a/backend/sftp/stringlock.go +++ b/backend/sftp/stringlock.go @@ -1,3 +1,5 @@ +// +build !plan9,go1.8 + package sftp import "sync" diff --git a/backend/sftp/stringlock_test.go b/backend/sftp/stringlock_test.go index 57179915e..9c129c343 100644 --- a/backend/sftp/stringlock_test.go +++ b/backend/sftp/stringlock_test.go @@ -1,3 +1,5 @@ +// +build !plan9,go1.8 + package sftp import ( diff --git a/fstest/fstests/gen_tests.go b/fstest/fstests/gen_tests.go index 705343202..f1dbc9658 100644 --- a/fstest/fstests/gen_tests.go +++ b/fstest/fstests/gen_tests.go @@ -159,7 +159,7 @@ func main() { generateTestProgram(t, fns, "Crypt") generateTestProgram(t, fns, "Crypt", suffix("2")) generateTestProgram(t, fns, "Crypt", suffix("3")) - generateTestProgram(t, fns, "Sftp") + generateTestProgram(t, fns, "Sftp", buildConstraint("!plan9,go1.8")) generateTestProgram(t, fns, "FTP") generateTestProgram(t, fns, "Box") generateTestProgram(t, fns, "QingStor", buildConstraint("!plan9,go1.7"))