Unified Diff: environs/sync/sync.go
Issue 70770043 :
all: use errgo instead of fmt.Errorf
Patch Set: all: use errgo instead of fmt.Errorf
Use n/p to move between diff chunks;
N/P to move between comments.
Please Sign in to add in-line comments.
Jump to:
[revision details]
agent/agent.go
agent/bootstrap.go
agent/format.go
agent/tools/toolsdir.go
bzr/bzr.go
cert/cert.go
cert/cert_test.go
charm/bundle.go
charm/charm.go
charm/config.go
charm/dir.go
charm/meta.go
charm/repo.go
charm/url.go
cloudinit/sshinit/configure.go
cmd/charm-admin/config.go
cmd/charm-admin/deletecharm.go
cmd/charmd/main.go
cmd/charmload/main.go
cmd/cmd.go
cmd/environmentcommand.go
cmd/filevar.go
cmd/juju/addmachine.go
cmd/juju/addrelation.go
cmd/juju/addunit.go
cmd/juju/authorisedkeys_add.go
cmd/juju/authorisedkeys_delete.go
cmd/juju/authorisedkeys_import.go
cmd/juju/bootstrap.go
cmd/juju/bootstrap_test.go
cmd/juju/constraints.go
cmd/juju/debughooks.go
cmd/juju/debuglog.go
cmd/juju/deploy.go
cmd/juju/destroyenvironment.go
cmd/juju/destroymachine.go
cmd/juju/destroyrelation.go
cmd/juju/destroyservice.go
cmd/juju/destroyunit.go
cmd/juju/environment.go
cmd/juju/expose.go
cmd/juju/get.go
cmd/juju/init.go
cmd/juju/publish.go
cmd/juju/resolved.go
cmd/juju/run.go
cmd/juju/scp.go
cmd/juju/set.go
cmd/juju/ssh.go
cmd/juju/switch.go
cmd/juju/synctools_test.go
cmd/juju/unexpose.go
cmd/juju/unset.go
cmd/juju/upgradecharm.go
cmd/juju/upgradejuju.go
cmd/jujud/agent.go
cmd/jujud/agent_test.go
cmd/jujud/bootstrap.go
cmd/jujud/machine.go
cmd/jujud/main.go
cmd/jujud/main_test.go
cmd/jujud/run.go
cmd/jujud/run_test.go
cmd/jujud/unit.go
cmd/output.go
cmd/plugins/juju-metadata/imagemetadata.go
cmd/plugins/juju-metadata/signmetadata.go
cmd/plugins/juju-metadata/toolsmetadata.go
cmd/plugins/juju-metadata/validateimagemetadata.go
cmd/plugins/juju-metadata/validatetoolsmetadata.go
cmd/plugins/juju-restore/restore.go
cmd/supercommand.go
cmd/supercommand_test.go
cmd/util_test.go
constraints/constraints.go
container/factory/factory.go
container/kvm/instance.go
container/kvm/kvm.go
container/kvm/libvirt.go
container/kvm/mock/mock-kvm.go
container/lxc/instance.go
container/lxc/mock/mock-lxc.go
downloader/downloader.go
environs/authenticationprovider.go
environs/boilerplate_config.go
environs/bootstrap/bootstrap.go
environs/bootstrap/bootstrap_test.go
environs/bootstrap/state.go
environs/bootstrap/synctools.go
environs/cloudinit.go
environs/cloudinit/cloudinit.go
environs/config.go
environs/config/authkeys.go
environs/config/config.go
environs/configstore/disk.go
environs/configstore/interface.go
environs/configstore/mem.go
environs/emptystorage.go
environs/errors.go
environs/filestorage/filestorage.go
environs/httpstorage/backend.go
environs/httpstorage/storage.go
environs/imagemetadata/upload.go
environs/imagemetadata/urls.go
environs/imagemetadata/validation.go
environs/instances/image.go
environs/instances/instancetype.go
environs/jujutest/livetests.go
environs/manual/bootstrap.go
environs/manual/init.go
environs/manual/provisioner.go
environs/open.go
environs/simplestreams/datasource.go
environs/simplestreams/decode.go
environs/simplestreams/simplestreams.go
environs/sshstorage/linewrapwriter_test.go
environs/sshstorage/storage.go
environs/storage/storage.go
environs/storage/storage_test.go
environs/sync/sync.go
environs/testing/storage.go
environs/tools/boilerplate.go
environs/tools/build.go
environs/tools/simplestreams.go
environs/tools/storage.go
environs/tools/tools.go
environs/tools/urls.go
environs/tools/validation.go
errors/errors_test.go
instance/address_test.go
instance/container.go
instance/instance.go
juju/api.go
juju/apiconn_test.go
juju/conn.go
juju/deploy.go
juju/osenv/vars_windows_test.go
juju/testing/instance.go
log/syslog/cmd.go
names/tag.go
provider/azure/config.go
provider/azure/customdata.go
provider/azure/environ.go
provider/azure/instance.go
provider/azure/instancetype.go
provider/common/bootstrap.go
provider/common/bootstrap_test.go
provider/common/destroy_test.go
provider/common/polling.go
provider/common/polling_test.go
provider/common/state.go
provider/dummy/environs.go
provider/ec2/config.go
provider/ec2/ec2.go
provider/ec2/image.go
provider/ec2/storage.go
provider/error.go
provider/joyent/config.go
provider/joyent/provider.go
provider/local/environ.go
provider/local/environprovider.go
provider/local/environprovider_test.go
provider/local/prereqs.go
provider/maas/config.go
provider/maas/environ.go
provider/maas/environprovider.go
provider/maas/storage.go
provider/manual/environ.go
provider/manual/environ_test.go
provider/manual/provider.go
provider/manual/provider_test.go
provider/openstack/config.go
provider/openstack/export_test.go
provider/openstack/local_test.go
provider/openstack/provider.go
provider/openstack/storage.go
replicaset/replicaset.go
replicaset/replicaset_test.go
rpc/client.go
rpc/jsoncodec/codec.go
rpc/jsoncodec/codec_test.go
rpc/rpc_test.go
rpc/rpcreflect/type.go
rpc/server.go
schema/schema.go
state/addmachine.go
state/address.go
state/annotator.go
state/api/agent/state.go
state/api/client.go
state/api/common/life.go
state/api/deployer/machine.go
state/api/firewaller/machine.go
state/api/firewaller/service.go
state/api/firewaller/unit.go
state/api/keyupdater/authorisedkeys.go
state/api/logger/logger.go
state/api/machiner/machine.go
state/api/params/params.go
state/api/provisioner/machine.go
state/api/provisioner/provisioner.go
state/api/uniter/charm.go
state/api/uniter/relation.go
state/api/uniter/relationunit.go
state/api/uniter/service.go
state/api/uniter/unit.go
state/api/uniter/uniter.go
state/api/upgrader/upgrader.go
state/apiserver/admin.go
state/apiserver/charms.go
state/apiserver/client/client.go
state/apiserver/client/destroy.go
state/apiserver/client/run.go
state/apiserver/client/tools.go
state/apiserver/common/common_test.go
state/apiserver/common/ensuredead_test.go
state/apiserver/common/environmachineswatcher.go
state/apiserver/common/environmachineswatcher_test.go
state/apiserver/common/environwatcher_test.go
state/apiserver/common/errors.go
state/apiserver/common/errors_test.go
state/apiserver/common/instanceidgetter_test.go
state/apiserver/common/life_test.go
state/apiserver/common/password_test.go
state/apiserver/common/remove.go
state/apiserver/common/remove_test.go
state/apiserver/common/setstatus_test.go
state/apiserver/common/tools.go
state/apiserver/common/tools_test.go
state/apiserver/common/unitswatcher_test.go
state/apiserver/common/watch_test.go
state/apiserver/deployer/deployer.go
state/apiserver/keymanager/keymanager.go
state/apiserver/root.go
state/apiserver/uniter/uniter.go
state/apiserver/upgrader/upgrader.go
state/apiserver/utils.go
state/cleanup.go
state/constraints.go
state/endpoint.go
state/machine.go
state/megawatcher.go
state/megawatcher_internal_test.go
state/minimumunits.go
state/multiwatcher/multiwatcher.go
state/multiwatcher/multiwatcher_internal_test.go
state/open.go
state/policy.go
state/prechecker_test.go
state/presence/presence.go
state/relation.go
state/relationunit.go
state/sequence.go
state/service.go
state/settings.go
state/state.go
state/state_test.go
state/statecmd/destroymachines.go
state/statecmd/machineconfig.go
state/statecmd/status.go
state/status.go
state/unit.go
state/user.go
state/watcher.go
state/watcher/helpers_test.go
state/watcher/watcher.go
store/branch.go
store/config.go
store/lpad.go
store/store.go
store/store_test.go
testing/cert.go
testing/charm.go
testing/checkers/bool_test.go
testing/checkers/deepequal.go
testing/locking.go
testing/locking_test.go
testing/mgo.go
testing/targz.go
testing/testbase/patch_test.go
tools/list.go
upgrades/systemsshkey.go
upgrades/upgrade_test.go
upstart/upstart.go
utils/apt.go
utils/apt_test.go
utils/fslock/fslock.go
utils/network.go
utils/parallel/try.go
utils/parallel/try_test.go
utils/password.go
utils/ssh/authorisedkeys.go
utils/ssh/clientkeys.go
utils/ssh/fingerprint.go
utils/ssh/generate.go
utils/ssh/run.go
utils/ssh/ssh.go
utils/ssh/ssh_gocrypto.go
utils/ssh/ssh_gocrypto_test.go
utils/ssh/ssh_openssh.go
utils/tailer/tailer_test.go
utils/trivial.go
utils/uuid.go
version/version.go
worker/deployer/deployer.go
worker/deployer/simple.go
worker/environ.go
worker/firewaller/firewaller.go
worker/instancepoller/machine_test.go
worker/instancepoller/updater.go
worker/instancepoller/updater_test.go
worker/machiner/machiner.go
worker/notifyworker_test.go
worker/peergrouper/desired.go
worker/peergrouper/desired_test.go
worker/peergrouper/mock_test.go
worker/peergrouper/worker.go
worker/peergrouper/worker_test.go
worker/provisioner/container_initialisation.go
worker/provisioner/provisioner_task.go
worker/rsyslog/worker.go
worker/runner.go
worker/runner_test.go
worker/simpleworker_test.go
worker/stringsworker_test.go
worker/uniter/charm/charm.go
worker/uniter/charm/deployer.go
worker/uniter/charm/git.go
worker/uniter/context.go
worker/uniter/debug/server.go
worker/uniter/hook/hook.go
worker/uniter/jujuc/config-get.go
worker/uniter/jujuc/context.go
worker/uniter/jujuc/juju-log.go
worker/uniter/jujuc/owner-get.go
worker/uniter/jujuc/ports.go
worker/uniter/jujuc/relation-get.go
worker/uniter/jujuc/relation-ids.go
worker/uniter/jujuc/relation-list.go
worker/uniter/jujuc/relation-set.go
worker/uniter/jujuc/server.go
worker/uniter/jujuc/server_test.go
worker/uniter/jujuc/unit-get.go
worker/uniter/jujuc/util_test.go
worker/uniter/modes.go
worker/uniter/relation/relation.go
worker/uniter/state.go
worker/uniter/tools.go
worker/uniter/uniter.go
worker/upgrader/upgrader.go
worker/upgrader/upgrader_test.go
Index: environs/sync/sync.go
=== modified file 'environs/sync/sync.go'
--- environs/sync/sync.go 2014-01-30 14:11:27 +0000
+++ environs/sync/sync.go 2014-03-03 12:00:09 +0000
@@ -5,13 +5,13 @@
import (
"bytes"
- "fmt"
"io"
"io/ioutil"
"net/http"
"os"
"path/filepath"
+ "github.com/juju/errgo/errors"
"github.com/loggo/loggo"
"launchpad.net/juju-core/environs/filestorage"
@@ -212,7 +212,7 @@
}
fileInfo, err := f.Stat()
if err != nil {
- return nil, fmt.Errorf("cannot stat newly made tools archive: %v", err)
+ return nil, errors.Notef(err, "cannot stat newly made tools archive")
}
size := fileInfo.Size()
logger.Infof("built tools %v (%dkB)", toolsVersion, (size+512)/1024)
