Merge pull request #163 from desimone/patch-4

helper/ssh: style
This commit is contained in:
Mitchell Hashimoto 2014-08-19 12:48:18 -07:00
commit e2abcb9c14
1 changed files with 3 additions and 4 deletions

View File

@ -218,10 +218,9 @@ func (c *SSHCommunicator) UploadDir(dst string, src string, excl []string) error
if src[len(src)-1] != '/' { if src[len(src)-1] != '/' {
log.Printf("No trailing slash, creating the source directory name") log.Printf("No trailing slash, creating the source directory name")
return scpUploadDirProtocol(filepath.Base(src), w, r, uploadEntries) return scpUploadDirProtocol(filepath.Base(src), w, r, uploadEntries)
} else {
// Trailing slash, so only upload the contents
return uploadEntries()
} }
// Trailing slash, so only upload the contents
return uploadEntries()
} }
return c.scpSession("scp -rvt "+dst, scpFunc) return c.scpSession("scp -rvt "+dst, scpFunc)