github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45708 from jianglingxia/jlx51215

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46686, 45049, 46323, 45708, 46487)

add some full stop and change some format
This commit is contained in:
Kubernetes Submit Queue 2017-06-01 03:42:10 -07:00 committed by GitHub
commit 05e2e1fd86
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubeadm/app/cmd/reset.go
View File

@ -155,8 +155,7 @@ func cleanDir(filePath string) error {
return err
}
for _, name := range names {
err = os.RemoveAll(filepath.Join(filePath, name))
if err != nil {
if err = os.RemoveAll(filepath.Join(filePath, name)); err != nil {
return err
}
}
@ -171,8 +170,7 @@ func resetConfigDir(configPathDir, pkiPathDir string) {
}
fmt.Printf("[reset] Deleting contents of config directories: %v\n", dirsToClean)
for _, dir := range dirsToClean {
err := cleanDir(dir)
if err != nil {
if err := cleanDir(dir); err != nil {
fmt.Printf("[reset] Failed to remove directory: %q [%v]\n", dir, err)
}
}
@ -185,8 +183,7 @@ func resetConfigDir(configPathDir, pkiPathDir string) {
}
fmt.Printf("[reset] Deleting files: %v\n", filesToClean)
for _, path := range filesToClean {
err := os.RemoveAll(path)
if err != nil {
if err := os.RemoveAll(path); err != nil {
fmt.Printf("[reset] Failed to remove file: %q [%v]\n", path, err)
}
}