Merge branch 'ando-masaki-master'
This commit is contained in:
commit
2e817490f9
|
@ -45,7 +45,16 @@ func (fw *InotifyFileWatcher) BlockUntilExists(t *tomb.Tomb) error {
|
||||||
case evt, ok := <-events:
|
case evt, ok := <-events:
|
||||||
if !ok {
|
if !ok {
|
||||||
return fmt.Errorf("inotify watcher has been closed")
|
return fmt.Errorf("inotify watcher has been closed")
|
||||||
} else if filepath.Clean(evt.Name) == fw.Filename {
|
}
|
||||||
|
evtName, err := filepath.Abs(evt.Name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
fwFilename, err := filepath.Abs(fw.Filename)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if evtName == fwFilename {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
case <-t.Dying():
|
case <-t.Dying():
|
||||||
|
|
Loading…
Reference in New Issue