shithub: hugo

Info  •  Files  •  Log  •  Branches

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

-- 

⑨