diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-06-28 17:07:28 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-06-28 17:07:28 +0200 |
| commit | 624340193c7aaec1baa714c65b1eed9af51f0c41 (patch) | |
| tree | 12973f4639ed62a470f7bdead8411596e2c93e8e | |
| parent | c333addb715c83c02326021d162b2c2af33dfc45 (diff) | |
| download | golang-624340193c7aaec1baa714c65b1eed9af51f0c41.tar.gz | |
Just don't use goinstall.log
| -rw-r--r-- | debian/patches/009-goinstall_can_install_to_GOPATH.patch | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/debian/patches/009-goinstall_can_install_to_GOPATH.patch b/debian/patches/009-goinstall_can_install_to_GOPATH.patch index 61ac96de7..706517681 100644 --- a/debian/patches/009-goinstall_can_install_to_GOPATH.patch +++ b/debian/patches/009-goinstall_can_install_to_GOPATH.patch @@ -1,6 +1,15 @@ --- a/src/cmd/goinstall/main.go +++ b/src/cmd/goinstall/main.go -@@ -77,6 +77,14 @@ func main() { +@@ -36,7 +36,7 @@ var ( + + allpkg = flag.Bool("a", false, "install all previously installed packages") + reportToDashboard = flag.Bool("dashboard", false, "report public packages at "+dashboardURL) +- logPkgs = flag.Bool("log", true, "log installed packages to $GOROOT/goinstall.log for use by -a") ++ logPkgs = flag.Bool("log", false, "log installed packages to $GOROOT/goinstall.log for use by -a") + update = flag.Bool("u", false, "update already-downloaded packages") + doInstall = flag.Bool("install", true, "build and install") + clean = flag.Bool("clean", false, "clean the package directory before installing") +@@ -77,6 +77,10 @@ func main() { os.Exit(1) } @@ -8,10 +17,17 @@ + fmt.Fprintf(os.Stderr, "%s: set $GOPATH to the directory you want packages installed to if you get permission denied error\n", argv0) + } + -+ if runtime.GOROOT() != build.defaultTree.Path { -+ logfile = filepath.Join(build.defaultTree.Path, "goinstall.log") -+ } -+ // special case - "unsafe" is already installed visit["unsafe"] = done +--- a/src/cmd/goinstall/doc.go ++++ b/src/cmd/goinstall/doc.go +@@ -16,7 +16,7 @@ Flags and default settings: + -clean=false clean the package directory before installing + -dashboard=false tally public packages on godashboard.appspot.com + -install=true build and install the package and its dependencies +- -log=true log installed packages to $GOROOT/goinstall.log for use by -a ++ -log=false log installed packages to $GOROOT/goinstall.log for use by -a + -nuke=false remove the target object and clean before installing + -u=false update already-downloaded packages + -v=false verbose operation |