Merge pull request bitly#106 from 18F/fix-watcher-build-tags

jehiah · jehiah · commit 577a3f7f0982 · 2015-05-30T20:05:40.000-04:00
Fix unsupported WatchForUpdates and build tags
diff --git a/validator_watcher_copy_test.go b/validator_watcher_copy_test.go
@@ -1,5 +1,4 @@
-// +build go1.3
-// +build !plan9,!solaris,!windows
+// +build go1.3,!plan9,!solaris,!windows
 
 // Turns out you can't copy over an existing file on Windows.
 
diff --git a/validator_watcher_test.go b/validator_watcher_test.go
@@ -1,5 +1,4 @@
-// +build go1.3
-// +build !plan9,!solaris
+// +build go1.3,!plan9,!solaris
 
 package main
 
diff --git a/watcher.go b/watcher.go
@@ -1,5 +1,4 @@
-// +build go1.3
-// +build !plan9,!solaris
+// +build go1.3,!plan9,!solaris
 
 package main
 
diff --git a/watcher_unsupported.go b/watcher_unsupported.go
@@ -1,13 +1,12 @@
-// +build go1.1
-// +build plan9,solaris
+// +build !go1.3 plan9 solaris
 
 package main
 
 import (
 	"log"
 )
 
-func WatchForUpdates(filename string, action func()) bool {
+func WatchForUpdates(filename string, done <-chan bool, action func()) bool {
 	log.Printf("file watching not implemented on this platform")
 	return false
 }

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,12 @@`
`1`		`-// +build go1.1`
`2`		`-// +build plan9,solaris`
	`1`	`+// +build !go1.3 plan9 solaris`
`3`	`2`
`4`	`3`	`package main`
`5`	`4`
`6`	`5`	`import (`
`7`	`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`	`10`	`log.Printf("file watching not implemented on this platform")`
`12`	`11`	`return false`
`13`	`12`	`}`