git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge pull request #106 from 18F/fix-watcher-build-tags
577a3f7Jehiah Czebotar
validator_watcher_copy_test.go+1−2
@@ -1,5 +1,4 @@
1−// +build go1.3
2−// +build !plan9,!solaris,!windows
1+// +build go1.3,!plan9,!solaris,!windows
3
2
4// Turns out you can't copy over an existing file on Windows.
3// Turns out you can't copy over an existing file on Windows.
5
4
validator_watcher_test.go+1−2
@@ -1,5 +1,4 @@
1−// +build go1.3
2−// +build !plan9,!solaris
1+// +build go1.3,!plan9,!solaris
3
2
4package main
3package main
5
4
watcher.go+1−2
@@ -1,5 +1,4 @@
1−// +build go1.3
2−// +build !plan9,!solaris
1+// +build go1.3,!plan9,!solaris
3
2
4package main
3package main
5
4
watcher_unsupported.go+2−3
@@ -1,5 +1,4 @@
1−// +build go1.1
2−// +build plan9,solaris
1+// +build !go1.3 plan9 solaris
3
2
4package main
3package main
5
4
@@ -7,7 +6,7 @@ import (
7 "log"
6 "log"
8)
7)
9
8
10−func WatchForUpdates(filename string, action func()) bool {
9+func WatchForUpdates(filename string, done <-chan bool, action func()) bool {
11 log.Printf("file watching not implemented on this platform")
10 log.Printf("file watching not implemented on this platform")
12 return false
11 return false
13}
12}