Merge pull request #575 from andrewwatson/fix-564-govcerr

fixes #564 by surfacing govc errors to end user
This commit is contained in:
Evan Hazlett
2015-02-21 16:32:11 -08:00
2 changed files with 10 additions and 5 deletions
+2 -2
View File
@@ -19,7 +19,7 @@ var (
func govc(args ...string) error {
cmd := exec.Command(GovcCmd, args...)
log.Debugf("executing: %v %v", GovcCmd, strings.Join(args, " "))
log.Debugf("govc executing: %v %v", GovcCmd, strings.Join(args, " "))
if err := cmd.Run(); err != nil {
return err
@@ -30,7 +30,7 @@ func govc(args ...string) error {
func govcOutErr(args ...string) (string, string, error) {
cmd := exec.Command(GovcCmd, args...)
log.Debugf("executing: %v %v", GovcCmd, strings.Join(args, " "))
log.Debugf("govcOutErr executing: %v %v", GovcCmd, strings.Join(args, " "))
var stdout bytes.Buffer
var stderr bytes.Buffer
+8 -3
View File
@@ -49,11 +49,16 @@ func (conn VcConn) DatastoreMkdir(dirName string) error {
args = append(args, fmt.Sprintf("--dc=%s", conn.driver.Datacenter))
args = append(args, dirName)
_, stderr, err := govcOutErr(args...)
if stderr == "" && err == nil {
return nil
} else {
if stderr != "" {
return errors.NewDatastoreError(conn.driver.Datastore, "mkdir", stderr)
}
if err != nil {
return err
}
return nil
}
func (conn VcConn) DatastoreUpload(localPath string) error {