| Index: environs/manual/bootstrap.go |
| === modified file 'environs/manual/bootstrap.go' |
| --- environs/manual/bootstrap.go 2014-02-20 02:24:46 +0000 |
| +++ environs/manual/bootstrap.go 2014-03-03 12:02:05 +0000 |
| @@ -4,9 +4,10 @@ |
| package manual |
| import ( |
| - "errors" |
| "fmt" |
| + "github.com/juju/errgo/errors" |
| + |
| "launchpad.net/juju-core/constraints" |
| "launchpad.net/juju-core/environs" |
| "launchpad.net/juju-core/environs/bootstrap" |
| @@ -37,7 +38,7 @@ |
| } |
| func errMachineIdInvalid(machineId string) error { |
| - return fmt.Errorf("%q is not a valid machine ID", machineId) |
| + return errors.Newf("%q is not a valid machine ID", machineId) |
| } |
| // NewManualBootstrapEnviron wraps a LocalStorageEnviron with another which |
| @@ -68,7 +69,7 @@ |
| provisioned, err := checkProvisioned(args.Host) |
| if err != nil { |
| - return fmt.Errorf("failed to check provisioned status: %v", err) |
| + return errors.Notef(err, "failed to check provisioned status") |
| } |
| if provisioned { |
| return ErrProvisioned |
