This commit is contained in:
Mitchell Hashimoto 2014-08-20 22:24:35 -07:00
parent 4015d942ab
commit efaedbabb0
3 changed files with 5 additions and 5 deletions

View File

@ -51,7 +51,7 @@ func init() {
// On Windows, this is the "terraform.rc" file in the application data // On Windows, this is the "terraform.rc" file in the application data
// directory. // directory.
func ConfigFile() (string, error) { func ConfigFile() (string, error) {
return configFile() return configFile()
} }
// LoadConfig loads the CLI configuration from ".terraformrc" files. // LoadConfig loads the CLI configuration from ".terraformrc" files.

View File

@ -32,7 +32,7 @@ func TestSetContains(t *testing.T) {
func TestSetDifference(t *testing.T) { func TestSetDifference(t *testing.T) {
s1 := &Set{F: testSetInt} s1 := &Set{F: testSetInt}
s2:= &Set{F: testSetInt} s2 := &Set{F: testSetInt}
s1.Add(1) s1.Add(1)
s1.Add(5) s1.Add(5)
@ -49,7 +49,7 @@ func TestSetDifference(t *testing.T) {
func TestSetIntersection(t *testing.T) { func TestSetIntersection(t *testing.T) {
s1 := &Set{F: testSetInt} s1 := &Set{F: testSetInt}
s2:= &Set{F: testSetInt} s2 := &Set{F: testSetInt}
s1.Add(1) s1.Add(1)
s1.Add(5) s1.Add(5)
@ -66,7 +66,7 @@ func TestSetIntersection(t *testing.T) {
func TestSetUnion(t *testing.T) { func TestSetUnion(t *testing.T) {
s1 := &Set{F: testSetInt} s1 := &Set{F: testSetInt}
s2:= &Set{F: testSetInt} s2 := &Set{F: testSetInt}
s1.Add(1) s1.Add(1)
s1.Add(5) s1.Add(5)

View File

@ -218,7 +218,7 @@ 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)
} }
// Trailing slash, so only upload the contents // Trailing slash, so only upload the contents
return uploadEntries() return uploadEntries()
} }