From 5eb0d4d152460b880c540a45af11b45893b27ed6 Mon Sep 17 00:00:00 2001
From: Alan Donovan <adonovan@google.com>
Date: Mon, 9 Sep 2013 21:31:33 -0400
Subject: [PATCH] go.tools/oracle: restore edits lost in rev aa9b649bccd9
 (botched merge)

R=crawshaw
TBR=crawshaw
CC=golang-dev
https://golang.org/cl/13604044
---
 cmd/oracle/main.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmd/oracle/main.go b/cmd/oracle/main.go
index b78576f5..c394be8e 100644
--- a/cmd/oracle/main.go
+++ b/cmd/oracle/main.go
@@ -25,6 +25,7 @@ import (
 	"runtime"
 	"runtime/pprof"
 
+	"code.google.com/p/go.tools/importer"
 	"code.google.com/p/go.tools/oracle"
 )
 
@@ -41,7 +42,7 @@ var ptalogFlag = flag.String("ptalog", "",
 var formatFlag = flag.String("format", "plain", "Output format: 'plain' or 'json'.")
 
 const usage = `Go source code oracle.
-Usage: oracle [<flag> ...] [<arg> ...]
+Usage: oracle [<flag> ...] <args> ...
 Use -help flag to display options.
 
 The -mode flag is required; the -pos flag is required in most modes.
@@ -55,7 +56,7 @@ Describe the syntax at offset 532 in this file (an import spec):
 Print the callgraph of the trivial web-server in JSON format:
 % oracle -mode=callgraph -format=json src/pkg/net/http/triv.go
 
-`
+` + importer.InitialPackagesUsage
 
 var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")
 
@@ -84,7 +85,7 @@ func main() {
 	var ptalog io.Writer
 	if *ptalogFlag != "" {
 		if f, err := os.Create(*ptalogFlag); err != nil {
-			log.Fatalf(err.Error())
+			log.Fatal(err)
 		} else {
 			buf := bufio.NewWriter(f)
 			ptalog = buf
@@ -114,7 +115,7 @@ func main() {
 	// Ask the oracle.
 	res, err := oracle.Query(args, *modeFlag, *posFlag, ptalog, &build.Default)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error: %s\n", err)
+		fmt.Fprintf(os.Stderr, "%s\n", err)
 		os.Exit(1)
 	}
 
@@ -123,7 +124,7 @@ func main() {
 	case "json":
 		b, err := json.Marshal(res)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "JSON error: %s\n", err.Error())
+			fmt.Fprintf(os.Stderr, "JSON error: %s\n", err)
 			os.Exit(1)
 		}
 		var buf bytes.Buffer