github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50303 from zouyee/newb

Browse Source 
Automatic merge from submit-queue

delete ineffectual assginment

**What this PR does / why we need it**:
delete ineffectual assignment
**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:
This commit is contained in:
Kubernetes Submit Queue
2017-08-18 02:46:09 -07:00
committed by GitHub
parent e472a758c7 847aa640b4
commit 2c6cb24e8a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/certificate/certificate_store.go
View File

@@ -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
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)
} }