Commit 847aa640 authored by zouyee's avatar zouyee

fix dump

parent c75d3028
...@@ -101,7 +101,7 @@ func (s *fileStore) recover() error { ...@@ -101,7 +101,7 @@ func (s *fileStore) recover() error {
} }
return err return err
} else if fi.Mode()&os.ModeSymlink != os.ModeSymlink { } else if fi.Mode()&os.ModeSymlink != os.ModeSymlink {
return fmt.Errorf("expected %q to be a symlink but it is a file.", updatedPath) return fmt.Errorf("expected %q to be a symlink but it is a file", updatedPath)
} }
// Move the 'updated' symlink to 'current'. // Move the 'updated' symlink to 'current'.
...@@ -184,7 +184,7 @@ func loadCertKeyBlocks(pairFile string) (cert *pem.Block, key *pem.Block, err er ...@@ -184,7 +184,7 @@ func loadCertKeyBlocks(pairFile string) (cert *pem.Block, key *pem.Block, err er
if certBlock == nil { if certBlock == nil {
return nil, nil, fmt.Errorf("could not decode the first block from %q from expected PEM format", pairFile) return nil, nil, fmt.Errorf("could not decode the first block from %q from expected PEM format", pairFile)
} }
keyBlock, rest := pem.Decode(rest) keyBlock, _ := pem.Decode(rest)
if keyBlock == nil { if keyBlock == nil {
return nil, nil, fmt.Errorf("could not decode the second block from %q from expected PEM format", pairFile) return nil, nil, fmt.Errorf("could not decode the second block from %q from expected PEM format", pairFile)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment