Merge remote-tracking branch 'upstream/fix/vendor_folder'

Gopkg.toml

@@ -118,5 +118,7 @@
   name = "github.com/ethereumproject/benchmark"
 
 [[constraint]]
-  branch = "master"
-  name = "github.com/fatih/color"
+  name = "github.com/fatih/color"
+  # TODO(tzdybal): monitor https://github.com/fatih/color/pull/87
+  source = "github.com/achilleas-k/color"
+  branch = "expose-colorised-stderr"

logger/glog/glog.go

@@ -966,14 +966,14 @@ func (l *loggingT) output(s severity, buf *buffer, file string, line int, alsoTo
 	}
 	data := buf.Bytes()
 	if l.toStderr {
-		color.StderrOutput.Write(data)
+		color.Error.Write(data)
 	} else {
 		if alsoToStderr || l.alsoToStderr || s >= l.stderrThreshold.get() {
-			color.StderrOutput.Write(data)
+			color.Error.Write(data)
 		}
 		if l.file[s] == nil {
 			if err := l.createFiles(s); err != nil {
-				color.StderrOutput.Write(data) // Make sure the message appears somewhere.
+				color.Error.Write(data) // Make sure the message appears somewhere.
 				l.exit(err)
 			}
 		}
@@ -1003,7 +1003,7 @@ func (l *loggingT) output(s severity, buf *buffer, file string, line int, alsoTo
 		// If -logtostderr has been specified, the loop below will do that anyway
 		// as the first stack in the full dump.
 		if !l.toStderr {
-			color.StderrOutput.Write(stacks(false))
+			color.Error.Write(stacks(false))
 		}
 		// Write the stack trace for all goroutines to the files.
 		trace := stacks(true)
@@ -1038,7 +1038,7 @@ func timeoutFlush(timeout time.Duration) {
 	select {
 	case <-done:
 	case <-time.After(timeout):
-		fmt.Fprintln(color.StderrOutput, "glog: Flush took longer than", timeout)
+		fmt.Fprintln(color.Error, "glog: Flush took longer than", timeout)
 	}
 }
 
@@ -1071,7 +1071,7 @@ var logExitFunc func(error)
 // It flushes the logs and exits the program; there's no point in hanging around.
 // l.mu is held.
 func (l *loggingT) exit(err error) {
-	fmt.Fprintf(color.StderrOutput, "log: exiting because of error: %s\n", err)
+	fmt.Fprintf(color.Error, "log: exiting because of error: %s\n", err)
 	// If logExitFunc is set, we do that instead of exiting.
 	if logExitFunc != nil {
 		logExitFunc(err)