From 8ac00f6c0d9b45376748434c629839a0a378c8b1 Mon Sep 17 00:00:00 2001 From: yoheimuta Date: Fri, 4 Nov 2016 17:56:42 +0900 Subject: [PATCH] Moved golang.org/x/net/context to context --- commands/configtest.go | 2 +- commands/discover.go | 2 +- commands/history.go | 2 +- commands/prepare.go | 2 +- commands/scan.go | 2 +- commands/tui.go | 2 +- glide.lock | 2 +- main.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/commands/configtest.go b/commands/configtest.go index c2413cdb..e80f6f4f 100644 --- a/commands/configtest.go +++ b/commands/configtest.go @@ -18,6 +18,7 @@ along with this program. If not, see . package commands import ( + "context" "flag" "io/ioutil" "os" @@ -26,7 +27,6 @@ import ( "github.com/Sirupsen/logrus" "github.com/google/subcommands" - "golang.org/x/net/context" c "github.com/future-architect/vuls/config" "github.com/future-architect/vuls/scan" diff --git a/commands/discover.go b/commands/discover.go index ddaf45fc..4aa32e2f 100644 --- a/commands/discover.go +++ b/commands/discover.go @@ -18,6 +18,7 @@ along with this program. If not, see . package commands import ( + "context" "flag" "fmt" "os" @@ -25,7 +26,6 @@ import ( "text/template" "github.com/google/subcommands" - "golang.org/x/net/context" "github.com/Sirupsen/logrus" ps "github.com/kotakanbe/go-pingscanner" diff --git a/commands/history.go b/commands/history.go index eccd55d0..95932866 100644 --- a/commands/history.go +++ b/commands/history.go @@ -18,6 +18,7 @@ along with this program. If not, see . package commands import ( + "context" "flag" "fmt" "io/ioutil" @@ -28,7 +29,6 @@ import ( c "github.com/future-architect/vuls/config" "github.com/future-architect/vuls/report" "github.com/google/subcommands" - "golang.org/x/net/context" ) // HistoryCmd is Subcommand of list scanned results diff --git a/commands/prepare.go b/commands/prepare.go index 0f4354e1..c44bc876 100644 --- a/commands/prepare.go +++ b/commands/prepare.go @@ -18,6 +18,7 @@ along with this program. If not, see . package commands import ( + "context" "flag" "os" "path/filepath" @@ -27,7 +28,6 @@ import ( "github.com/future-architect/vuls/scan" "github.com/future-architect/vuls/util" "github.com/google/subcommands" - "golang.org/x/net/context" ) // PrepareCmd is Subcommand of host discovery mode diff --git a/commands/scan.go b/commands/scan.go index d902538d..5fd6096c 100644 --- a/commands/scan.go +++ b/commands/scan.go @@ -18,6 +18,7 @@ along with this program. If not, see . package commands import ( + "context" "flag" "fmt" "io/ioutil" @@ -34,7 +35,6 @@ import ( "github.com/future-architect/vuls/util" "github.com/google/subcommands" "github.com/k0kubun/pp" - "golang.org/x/net/context" ) // ScanCmd is Subcommand of host discovery mode diff --git a/commands/tui.go b/commands/tui.go index 4c7c1502..1b9cd53f 100644 --- a/commands/tui.go +++ b/commands/tui.go @@ -18,6 +18,7 @@ along with this program. If not, see . package commands import ( + "context" "flag" "io/ioutil" "os" @@ -28,7 +29,6 @@ import ( c "github.com/future-architect/vuls/config" "github.com/future-architect/vuls/report" "github.com/google/subcommands" - "golang.org/x/net/context" ) // TuiCmd is Subcommand of host discovery mode diff --git a/glide.lock b/glide.lock index 32a30e26..3784b9ea 100644 --- a/glide.lock +++ b/glide.lock @@ -48,7 +48,7 @@ imports: - name: github.com/go-sql-driver/mysql version: 2a6c6079c7eff49a7e9d641e109d922f124a3e4c - name: github.com/google/subcommands - version: 1c7173745a6001f67d8d96ab4e178284c77f7759 + version: a71b91e238406bd68766ee52db63bebedce0e9f6 - name: github.com/gosuri/uitable version: 36ee7e946282a3fb1cfecd476ddc9b35d8847e42 subpackages: diff --git a/main.go b/main.go index 92ee5bf2..e96c6bce 100644 --- a/main.go +++ b/main.go @@ -22,7 +22,7 @@ import ( "fmt" "os" - "golang.org/x/net/context" + "context" "github.com/future-architect/vuls/commands" "github.com/google/subcommands"