cleanup swarm key open logic
License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Apr 20, 2018 at 09:31 UTC
6c3c73dee471ca54c25ba915d020a1725a99910f
1 file changed
+2
-6
repo/fsrepo/fsrepo.go
+2
-6
@@ -701,15 +701,11 @@ func (r *FSRepo) SwarmKey() ([]byte, error) {
701
f, err := os.Open(spath)
702
if err != nil {
703
if os.IsNotExist(err) {
704
- return nil, nil
705
- } else {
706
- return nil, err
704
+ err = nil
705
}
708
- }
709
- defer f.Close()
710
- if err != nil {
706
return nil, err
707
}
708
+ defer f.Close()
709
710
return ioutil.ReadAll(f)
711
}