summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2016-03-22 23:44:02 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2016-03-22 23:44:02 +0100
commit283b866386c6462c0630e1b6152c28fa83a92d50 (patch)
tree00f328045a6492410a5a37f197c79212820883a5 /commands
parent35b798247e2baaeddc84bfba1c43b06fdaca79f8 (diff)
commands: Do not use named return vals in Jekyll import
Diffstat (limited to 'commands')
-rw-r--r--commands/import_jekyll.go12
1 files changed, 8 insertions, 4 deletions
diff --git a/commands/import_jekyll.go b/commands/import_jekyll.go
index 30a86528f..25228c9f2 100644
--- a/commands/import_jekyll.go
+++ b/commands/import_jekyll.go
@@ -260,7 +260,7 @@ func createConfigFromJekyll(inpath string, kind string, jekyllConfig map[string]
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 @@ func copyFile(source string, dest string) (err error) {
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 @@ func copyDir(source string, dest string) (err error) {
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