Merge branch 'master' into f19

* master:
  replace f21+ hostname patch that fedpkg import deleted
This commit is contained in:
Adam Miller 2014-02-19 10:43:17 -06:00
commit 957169509d
1 changed files with 13 additions and 0 deletions

13
golang-f21-hostname.patch Normal file
View File

@ -0,0 +1,13 @@
Index: go/src/pkg/os/os_test.go
===================================================================
--- go.orig/src/pkg/os/os_test.go
+++ go/src/pkg/os/os_test.go
@@ -842,7 +842,7 @@ func run(t *testing.T, cmd []string) str
if err != nil {
t.Fatal(err)
}
- p, err := StartProcess("/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
+ p, err := StartProcess("/usr/bin/hostname", []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
if err != nil {
t.Fatal(err)
}