From 25205d64d77d0dca5cb5fffac3df5b66036a4d2b Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Mon, 26 Sep 2016 17:23:26 +0200
Subject: [release/1.4.14] cmd/utils: don't check for stderr redirect on
 windows

The redirect check did not work on Go 1.6 and below because Stat
returned an error for stdout and stderr. In Go 1.7 Stat works on stdout
but doesn't return anything meaningful, causing cmd/geth test failures
because the message is printed to stderr only. Fix it by printing to
stdout only.

(cherry picked from commit b04219fdbbef06527f77e93129d6a196b6841f44)
---
 cmd/utils/cmd.go | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'cmd')

diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 3b521a0e1..584afc804 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -23,6 +23,7 @@ import (
 	"os"
 	"os/signal"
 	"regexp"
+	"runtime"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
@@ -52,10 +53,16 @@ func openLogFile(Datadir string, filename string) *os.File {
 // is redirected to a different file.
 func Fatalf(format string, args ...interface{}) {
 	w := io.MultiWriter(os.Stdout, os.Stderr)
-	outf, _ := os.Stdout.Stat()
-	errf, _ := os.Stderr.Stat()
-	if outf != nil && errf != nil && os.SameFile(outf, errf) {
-		w = os.Stderr
+	if runtime.GOOS == "windows" {
+		// The SameFile check below doesn't work on Windows.
+		// stdout is unlikely to get redirected though, so just print there.
+		w = os.Stdout
+	} else {
+		outf, _ := os.Stdout.Stat()
+		errf, _ := os.Stderr.Stat()
+		if outf != nil && errf != nil && os.SameFile(outf, errf) {
+			w = os.Stderr
+		}
 	}
 	fmt.Fprintf(w, "Fatal: "+format+"\n", args...)
 	logger.Flush()
-- 
cgit v1.2.3


From d4608ae0d2fc76ea1ba1d3a97033e60bab1f0d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Wed, 28 Sep 2016 13:31:06 +0300
Subject: [release/1.4.14] VERSION, cmd/geth: bumped version 1.4.14

---
 cmd/geth/main.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'cmd')

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 8bcf5c14c..71a185eb5 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -47,11 +47,11 @@ import (
 )
 
 const (
-	clientIdentifier = "Geth"   // Client identifier to advertise over the network
-	versionMajor     = 1        // Major version component of the current release
-	versionMinor     = 4        // Minor version component of the current release
-	versionPatch     = 13       // Patch version component of the current release
-	versionMeta      = "stable" // Version metadata to append to the version string
+	clientIdentifier = "Geth"       // Client identifier to advertise over the network
+	versionMajor     = 1            // Major version component of the current release
+	versionMinor     = 4            // Minor version component of the current release
+	versionPatch     = 14           // Patch version component of the current release
+	versionMeta      = "prerelease" // Version metadata to append to the version string
 
 	versionOracle = "0xfa7b9770ca4cb04296cac84f37736d4041251cdf" // Ethereum address of the Geth release oracle
 )
-- 
cgit v1.2.3