[SCM] Packaging for Google Go branch, weekly-debian-sid, updated. debian-weekly/2011.06.09-2-14-g5976088
Ondřej Surý
ondrej at sury.org
Mon Jul 18 09:33:10 UTC 2011
The following commit has been merged in the weekly-debian-sid branch:
commit 0a92100341e787c99e5c4eeb846d0314a1c27e9b
Author: Ondřej Surý <ondrej at sury.org>
Date: Tue Jun 28 17:07:28 2011 +0200
Just don't use goinstall.log
diff --git a/debian/patches/009-goinstall_can_install_to_GOPATH.patch b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
index 61ac96d..7065176 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
--
Packaging for Google Go
More information about the Pkg-google-commits
mailing list