Skip to content

Commit 8a398fb

Browse files
refresh dependencies
- also, use consistently same log lib everywhere Signed-off-by: António Meireles <antonio.meireles@reformi.st>
1 parent f6d3a46 commit 8a398fb

173 files changed

Lines changed: 23718 additions & 1312 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Godeps/Godeps.json‎

Lines changed: 118 additions & 106 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Godeps: force
101101
$(RM) vendor/
102102
# XXX godep won't save this as a build dep run a runtime one so we cheat...
103103
$(SED) -i.bak \
104-
-e s"|github.com/helm/helm/log|github.com/shurcooL/vfsgen|" \
104+
-e s"|github.com/deis/pkg/log|github.com/shurcooL/vfsgen|" \
105105
-e "s|import (|import ( \"github.com/shurcooL/httpfs/vfsutil\"|" \
106106
components/common/assets/assets.go
107107
$(GODEP) save ./...

‎cmd/client/delete.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package main
1717

1818
import (
19-
"github.com/helm/helm/log"
19+
"github.com/deis/pkg/log"
2020

2121
"github.com/TheNewNormal/corectl/components/common"
2222
"github.com/TheNewNormal/corectl/components/host/session"

‎cmd/client/main.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/TheNewNormal/corectl/components/common"
2323
"github.com/TheNewNormal/corectl/components/host/session"
24-
"github.com/helm/helm/log"
24+
"github.com/deis/pkg/log"
2525
"github.com/spf13/cobra"
2626
)
2727

@@ -34,9 +34,7 @@ func init() {
3434
rootCmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) (err error) {
3535
cli := session.Caller.CmdLine
3636
cli.BindPFlags(cmd.Flags())
37-
if cli.GetBool("debug") {
38-
log.IsDebugging = true
39-
}
37+
log.DefaultLogger.SetDebug(cli.GetBool("debug"))
4038

4139
if session.Caller.Privileged {
4240
return fmt.Errorf("too many privileges invoking %v, "+

‎cmd/client/run.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/TheNewNormal/corectl/components/host/session"
2626
"github.com/TheNewNormal/corectl/components/server"
2727
"github.com/TheNewNormal/corectl/components/target/coreos"
28-
"github.com/helm/helm/log"
28+
"github.com/deis/pkg/log"
2929
"github.com/satori/go.uuid"
3030
"github.com/spf13/cobra"
3131
"github.com/spf13/pflag"

‎cmd/server/main.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/TheNewNormal/corectl/components/common"
2424
"github.com/TheNewNormal/corectl/components/host/session"
2525

26-
"github.com/helm/helm/log"
26+
"github.com/deis/pkg/log"
2727
"github.com/spf13/cobra"
2828
)
2929

@@ -34,9 +34,7 @@ func init() {
3434
func(cmd *cobra.Command, args []string) (err error) {
3535
cli := session.Caller.CmdLine
3636
cli.BindPFlags(cmd.Flags())
37-
if cli.GetBool("debug") {
38-
log.IsDebugging = true
39-
}
37+
log.DefaultLogger.SetDebug(cli.GetBool("debug"))
4038

4139
if !session.Caller.Privileged && cmd.Name() == "uuid2mac" {
4240
return fmt.Errorf("attempting a privileged operation without " +

‎cmd/server/server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/TheNewNormal/corectl/components/host/session"
2525
"github.com/TheNewNormal/corectl/components/server"
2626
"github.com/TheNewNormal/corectl/release"
27-
"github.com/helm/helm/log"
27+
"github.com/deis/pkg/log"
2828
"github.com/satori/go.uuid"
2929

3030
"github.com/everdev/mack"

‎components/common/assets/assets.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"io/ioutil"
55
"net/http"
66

7-
"github.com/helm/helm/log"
7+
"github.com/deis/pkg/log"
88
)
99

1010
func Contents(file string) (t string) {

‎components/common/common.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/TheNewNormal/corectl/components/server"
2727
"github.com/TheNewNormal/corectl/release"
2828
"github.com/blang/semver"
29-
"github.com/helm/helm/log"
29+
"github.com/deis/pkg/log"
3030
"github.com/spf13/cobra"
3131
"github.com/spf13/cobra/doc"
3232
)

‎components/host/session/session.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/TheNewNormal/corectl/components/target/coreos"
3232
"github.com/TheNewNormal/corectl/release"
3333
"github.com/bugsnag/osext"
34-
"github.com/helm/helm/log"
34+
"github.com/deis/pkg/log"
3535
"github.com/spf13/viper"
3636
)
3737

0 commit comments

Comments
 (0)
⌂ 换网址