shithub: hugo

Download patch

ref: 283b866386c6462c0630e1b6152c28fa83a92d50
parent: 35b798247e2baaeddc84bfba1c43b06fdaca79f8
author: Bjørn Erik Pedersen <[email protected]>
date: Tue Mar 22 19:44:02 EDT 2016 

commands: Do not use named return vals in Jekyll import


--- a/commands/import_jekyll.go
+++ b/commands/import_jekyll.go
@@ -260,7 +260,7 @@
 	return nil
 }
 
-func copyFile(source string, dest string) (err error) {
+func copyFile(source string, dest string) error {
 	sf, err := os.Open(source)
 	if err != nil {
 		return err
@@ -276,13 +276,17 @@
 		si, err := os.Stat(source)
 		if err != nil {
 			err = os.Chmod(dest, si.Mode())
+
+			if err != nil {
+				return err
+			}
 		}
 
 	}
-	return
+	return nil
 }
 
-func copyDir(source string, dest string) (err error) {
+func copyDir(source string, dest string) error {
 	fi, err := os.Stat(source)
 	if err != nil {
 		return err
@@ -314,7 +318,7 @@
 	return nil
 }
 
-func copyJekyllFilesAndFolders(jekyllRoot string, dest string) (err error) {
+func copyJekyllFilesAndFolders(jekyllRoot string, dest string) error {
 	fi, err := os.Stat(jekyllRoot)
 	if err != nil {
 		return err