Merge lp:~thumper/juju-core/juju-errors into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Extract errors package to github.com/juju/errors

Also introduces a dependency on github.com/juju/errgo
and removes the github.com/errgo/errgo dependency.

Adds additional functions for simple tracing and
annotations of errors.

https://codereview.appspot.com/93410043/

Extract errors package to github.com/juju/errors

Also introduces a dependency on github.com/juju/errgo
and removes the github.com/errgo/errgo dependency.

Adds additional functions for simple tracing and
annotations of errors.

https://codereview.appspot.com/93410043/

[Tim Penhey (thumper)]

Reviewers: mp+219608_code.launchpad.net,

Message:
Please take a look.

Description:
Extract errors package to github.com/juju/errors

Also introduces a dependency on github.com/juju/errgo
and removes the github.com/errgo/errgo dependency.

Adds additional functions for simple tracing and
annotations of errors.

https://code.launchpad.net/~thumper/juju-core/juju-errors/+merge/219608

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/93410043/

Affected files (+254, -658 lines):
   A [revision details]
   M agent/agent.go
   M agent/tools/toolsdir.go
   M cert/cert.go
   M cmd/juju/bootstrap_test.go
   M cmd/juju/common.go
   M cmd/juju/debuglog.go
   M cmd/juju/debuglog_test.go
   M cmd/juju/deploy_test.go
   M cmd/juju/destroyenvironment_test.go
   M cmd/juju/removemachine_test.go
   M cmd/jujud/agent.go
   M cmd/jujud/bootstrap_test.go
   M cmd/jujud/machine.go
   M cmd/jujud/machine_test.go
   M constraints/constraints.go
   M container/kvm/container.go
   M container/kvm/kvm.go
   M container/lxc/instance.go
   M dependencies.tsv
   M environs/bootstrap/state.go
   M environs/bootstrap/synctools.go
   M environs/cloudinit.go
   M environs/cloudinit/cloudinit.go
   M environs/config.go
   M environs/config/config.go
   M environs/configstore/disk.go
   M environs/configstore/disk_test.go
   M environs/configstore/mem.go
   M environs/emptystorage.go
   M environs/emptystorage_test.go
   M environs/filestorage/filestorage.go
   M environs/filestorage/filestorage_test.go
   M environs/httpstorage/storage.go
   M environs/httpstorage/storage_test.go
   M environs/imagemetadata/generate.go
   M environs/jujutest/livetests.go
   M environs/jujutest/tests.go
   M environs/open.go
   M environs/open_test.go
   M environs/simplestreams/datasource.go
   M environs/simplestreams/simplestreams.go
   M environs/sshstorage/storage.go
   M environs/sshstorage/storage_test.go
   M environs/tools/simplestreams.go
   M environs/tools/tools.go
   M environs/tools/tools_test.go
   D errors/errors.go
   D errors/errors_test.go
   M juju/api.go
   M juju/apiconn_test.go
   M juju/conn.go
   M juju/conn_test.go
   M provider/azure/certfile.go
   M provider/azure/environ.go
   M provider/azure/instance.go
   M provider/azure/instancetype.go
   M provider/azure/storage.go
   M provider/azure/storage_test.go
   M provider/common/destroy_test.go
   M provider/dummy/storage.go
   M provider/ec2/ec2.go
   M provider/ec2/storage.go
   M provider/joyent/environ_instance.go
   M provider/joyent/storage.go
   M provider/joyent/storage_test.go
   M provider/local/environ.go
   M provider/local/instance.go
   M provider/maas/environ.go
   M provider/maas/environ_whitebox_test.go
   M provider/maas/storage.go
   M provider/maas/storage_test.go
   M provider/manual/environ.go
   M provider/openstack/provider.go
   M provider/openstack/storage.go
   M state/addmachine.go
   M state/annotator.go
   M state/api/agent/machine_test.go
   M state/api/client.go
   M state/api/machiner/machiner_test.go
   M state/api/provisioner/provisioner_test.go
   M state/api/uniter/unit_test.go
   M state/api/upgrader/unitupgrader_test.go
   ...

[Dave Cheney (dave-cheney)]

mien gott

On Thu, May 15, 2014 at 7:57 AM, Tim Penhey <email address hidden> wrote:
> Reviewers: mp+219608_code.launchpad.net,
>
> Message:
> Please take a look.
>
> Description:
> Extract errors package to github.com/juju/errors
>
> Also introduces a dependency on github.com/juju/errgo
> and removes the github.com/errgo/errgo dependency.
>
> Adds additional functions for simple tracing and
> annotations of errors.
>
> https://code.launchpad.net/~thumper/juju-core/juju-errors/+merge/219608
>
> (do not edit description out of merge proposal)
>
>
> Please review this at https://codereview.appspot.com/93410043/
>
> Affected files (+254, -658 lines):
> A [revision details]
> M agent/agent.go
> M agent/tools/toolsdir.go
> M cert/cert.go
> M cmd/juju/bootstrap_test.go
> M cmd/juju/common.go
> M cmd/juju/debuglog.go
> M cmd/juju/debuglog_test.go
> M cmd/juju/deploy_test.go
> M cmd/juju/destroyenvironment_test.go
> M cmd/juju/removemachine_test.go
> M cmd/jujud/agent.go
> M cmd/jujud/bootstrap_test.go
> M cmd/jujud/machine.go
> M cmd/jujud/machine_test.go
> M constraints/constraints.go
> M container/kvm/container.go
> M container/kvm/kvm.go
> M container/lxc/instance.go
> M dependencies.tsv
> M environs/bootstrap/state.go
> M environs/bootstrap/synctools.go
> M environs/cloudinit.go
> M environs/cloudinit/cloudinit.go
> M environs/config.go
> M environs/config/config.go
> M environs/configstore/disk.go
> M environs/configstore/disk_test.go
> M environs/configstore/mem.go
> M environs/emptystorage.go
> M environs/emptystorage_test.go
> M environs/filestorage/filestorage.go
> M environs/filestorage/filestorage_test.go
> M environs/httpstorage/storage.go
> M environs/httpstorage/storage_test.go
> M environs/imagemetadata/generate.go
> M environs/jujutest/livetests.go
> M environs/jujutest/tests.go
> M environs/open.go
> M environs/open_test.go
> M environs/simplestreams/datasource.go
> M environs/simplestreams/simplestreams.go
> M environs/sshstorage/storage.go
> M environs/sshstorage/storage_test.go
> M environs/tools/simplestreams.go
> M environs/tools/tools.go
> M environs/tools/tools_test.go
> D errors/errors.go
> D errors/errors_test.go
> M juju/api.go
> M juju/apiconn_test.go
> M juju/conn.go
> M juju/conn_test.go
> M provider/azure/certfile.go
> M provider/azure/environ.go
> M provider/azure/instance.go
> M provider/azure/instancetype.go
> M provider/azure/storage.go
> M provider/azure/storage_test.go
> M provider/common/destroy_test.go
> M provider/dummy/storage.go
> M provider/ec2/ec2.go
> M provider/ec2/storage.go
> M provider/joyent/environ_instance.go
> M provider/joyent/storage.go
> M provider/joyent/storage_test.go
> M provider/local/environ.go
> M provider/local/instance.go
> M provider/maas/environ.go
> M provider/maas/environ_whitebox_test.go
> M provider/maas/storage.go
> M provider/maas/storage_test.go
> M provider/manual/environ.go
> M provider/openstack/provider.go
> M provider/openstack/storage.go
> M s...

[Andrew Wilkins (axwalk)]

LGTM with a minor renaming

https://codereview.appspot.com/93410043/diff/1/provider/openstack/storage.go
File provider/openstack/storage.go (right):

https://codereview.appspot.com/93410043/diff/1/provider/openstack/storage.go#newcode12
provider/openstack/storage.go:12: coreerrors "github.com/juju/errors"
s/coreerrors/jujuerrors/

https://codereview.appspot.com/93410043/diff/1/state/apiserver/client/destroy_test.go
File state/apiserver/client/destroy_test.go (right):

https://codereview.appspot.com/93410043/diff/1/state/apiserver/client/destroy_test.go#newcode9
state/apiserver/client/destroy_test.go:9: coreerrors
"github.com/juju/errors"
ditto
(and anywhere else coreerrors exists)

https://codereview.appspot.com/93410043/

[Go Bot (go-bot)]

The attempt to merge lp:~thumper/juju-core/juju-errors into lp:juju-core failed. Below is the output from the failed tests.

godeps: cannot parse "dependencies.tsv": cannot find directory for "github.com/juju/errgo": not found in GOPATH
mongod: no process found

[Dave Cheney (dave-cheney)]

LGTM. I have the same comment as axw about renaming the juju/errors
import. Can that be avoided -- it's totally cool to defer that to a
later branch and leave this as the mechanical translation.

https://codereview.appspot.com/93410043/

=== modified file 'agent/agent.go'
--- agent/agent.go	2014-04-23 08:50:28 +0000
+++ agent/agent.go	2014-05-15 02:28:23 +0000
@@ -15,7 +15,7 @@
 	"strconv"
 	"strings"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/instance"
@@ -247,23 +247,23 @@
 // machine or unit agent.
 func NewAgentConfig(configParams AgentConfigParams) (ConfigSetterWriter, error) {
 	if configParams.DataDir == "" {
-		return nil, errgo.Trace(requiredError("data directory"))
+		return nil, errors.Trace(requiredError("data directory"))
 	}
 	logDir := DefaultLogDir
 	if configParams.LogDir != "" {
 		logDir = configParams.LogDir
 	}
 	if configParams.Tag == "" {
-		return nil, errgo.Trace(requiredError("entity tag"))
+		return nil, errors.Trace(requiredError("entity tag"))
 	}
 	if configParams.UpgradedToVersion == version.Zero {
-		return nil, errgo.Trace(requiredError("upgradedToVersion"))
+		return nil, errors.Trace(requiredError("upgradedToVersion"))
 	}
 	if configParams.Password == "" {
-		return nil, errgo.Trace(requiredError("password"))
+		return nil, errors.Trace(requiredError("password"))
 	}
 	if len(configParams.CACert) == 0 {
-		return nil, errgo.Trace(requiredError("CA certificate"))
+		return nil, errors.Trace(requiredError("CA certificate"))
 	}
 	// Note that the password parts of the state and api information are
 	// blank.  This is by design.
@@ -302,16 +302,16 @@
 // a machine running the state server.
 func NewStateMachineConfig(configParams AgentConfigParams, serverInfo params.StateServingInfo) (ConfigSetterWriter, error) {
 	if serverInfo.Cert == "" {
-		return nil, errgo.Trace(requiredError("state server cert"))
+		return nil, errors.Trace(requiredError("state server cert"))
 	}
 	if serverInfo.PrivateKey == "" {
-		return nil, errgo.Trace(requiredError("state server key"))
+		return nil, errors.Trace(requiredError("state server key"))
 	}
 	if serverInfo.StatePort == 0 {
-		return nil, errgo.Trace(requiredError("state port"))
+		return nil, errors.Trace(requiredError("state port"))
 	}
 	if serverInfo.APIPort == 0 {
-		return nil, errgo.Trace(requiredError("api port"))
+		return nil, errors.Trace(requiredError("api port"))
 	}
 	config, err := NewAgentConfig(configParams)
 	if err != nil {
@@ -535,7 +535,7 @@
 
 func (c *configInternal) APIAddresses() ([]string, error) {
 	if c.apiDetails == nil {
-		return []string{}, errgo.New("No apidetails in config")
+		return []string{}, errors.New("No apidetails in config")
 	}
 	return append([]string{}, c.apiDetails.addresses...), nil
 }
@@ -554,7 +554,7 @@
 
 func (c *configInternal) check() error {
 	if c.stateDetails == nil && c.apiDetails == nil {
-		return errgo.Trace(requiredError("state or API addresses"))
+		return errors.Trace(requiredError("state or API addresses"))
 	}
 	if c.stateDetails != nil {
 		if err := checkAddrs(c.stateDetails.addresses, "state server address"); err != nil {
@@ -573,11 +573,11 @@
 
 func checkAddrs(addrs []string, what string) error {
 	if len(addrs) == 0 {
-		return errgo.Trace(requiredError(what))
+		return errors.Trace(requiredError(what))
 	}
 	for _, a := range addrs {
 		if !validAddr.MatchString(a) {
-			return errgo.New("invalid %s %q", what, a)
+			return errors.Errorf("invalid %s %q", what, a)
 		}
 	}
 	return nil
 
=== modified file 'agent/tools/toolsdir.go'
--- agent/tools/toolsdir.go	2014-03-14 01:16:20 +0000
+++ agent/tools/toolsdir.go	2014-05-15 02:28:23 +0000
@@ -15,7 +15,7 @@
 	"path"
 	"strings"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
@@ -101,7 +101,7 @@
 		}
 		name := path.Join(dir, hdr.Name)
 		if err := writeFile(name, os.FileMode(hdr.Mode&0777), tr); err != nil {
-			return errgo.Annotatef(err, "tar extract %q failed", name)
+			return errors.Annotatef(err, "tar extract %q failed", name)
 		}
 	}
 	toolsMetadataData, err := json.Marshal(tools)
 
=== modified file 'cert/cert.go'
--- cert/cert.go	2014-04-30 23:18:40 +0000
+++ cert/cert.go	2014-05-15 02:28:23 +0000
@@ -11,13 +11,12 @@
 	"crypto/x509"
 	"crypto/x509/pkix"
 	"encoding/pem"
-	"errors"
 	"fmt"
 	"math/big"
 	"net"
 	"time"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 )
 
 var KeyBits = 1024
@@ -64,11 +63,11 @@
 func Verify(srvCertPEM, caCertPEM string, when time.Time) error {
 	caCert, err := ParseCert(caCertPEM)
 	if err != nil {
-		return errgo.Annotate(err, "cannot parse CA certificate")
+		return errors.Annotate(err, "cannot parse CA certificate")
 	}
 	srvCert, err := ParseCert(srvCertPEM)
 	if err != nil {
-		return errgo.Annotate(err, "cannot parse server certificate")
+		return errors.Annotate(err, "cannot parse server certificate")
 	}
 	pool := x509.NewCertPool()
 	pool.AddCert(caCert)
 
=== modified file 'cmd/juju/bootstrap_test.go'
--- cmd/juju/bootstrap_test.go	2014-05-12 05:23:59 +0000
+++ cmd/juju/bootstrap_test.go	2014-05-15 02:28:23 +0000
@@ -7,6 +7,7 @@
 	"fmt"
 	"strings"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
@@ -26,7 +27,6 @@
 	envtesting "launchpad.net/juju-core/environs/testing"
 	envtools "launchpad.net/juju-core/environs/tools"
 	ttesting "launchpad.net/juju-core/environs/tools/testing"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/arch"
 	"launchpad.net/juju-core/provider/dummy"
 	coretesting "launchpad.net/juju-core/testing"
 
=== modified file 'cmd/juju/common.go'
--- cmd/juju/common.go	2014-04-14 12:36:13 +0000
+++ cmd/juju/common.go	2014-05-15 02:28:23 +0000
@@ -6,12 +6,13 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state/api"
 )
 
 
=== modified file 'cmd/juju/debuglog.go'
--- cmd/juju/debuglog.go	2014-05-12 05:23:59 +0000
+++ cmd/juju/debuglog.go	2014-05-15 02:28:23 +0000
@@ -7,12 +7,12 @@
 	"fmt"
 	"io"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/envcmd"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/state/api"
 )
 
=== modified file 'cmd/juju/debuglog_test.go'
--- cmd/juju/debuglog_test.go	2014-05-12 05:23:59 +0000
+++ cmd/juju/debuglog_test.go	2014-05-15 02:28:23 +0000
@@ -9,13 +9,13 @@
 	"io/ioutil"
 	"strings"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/envcmd"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/testing"
 )
 
=== modified file 'cmd/juju/deploy_test.go'
--- cmd/juju/deploy_test.go	2014-05-12 04:28:39 +0000
+++ cmd/juju/deploy_test.go	2014-05-15 02:28:23 +0000
@@ -6,13 +6,13 @@
 import (
 	"strings"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/juju/testing"
 
=== modified file 'cmd/juju/destroyenvironment_test.go'
--- cmd/juju/destroyenvironment_test.go	2014-04-14 12:36:13 +0000
+++ cmd/juju/destroyenvironment_test.go	2014-05-15 02:28:23 +0000
@@ -6,13 +6,13 @@
 import (
 	"bytes"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/configstore"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/provider/dummy"
 
=== modified file 'cmd/juju/removemachine_test.go'
--- cmd/juju/removemachine_test.go	2014-05-12 05:23:59 +0000
+++ cmd/juju/removemachine_test.go	2014-05-15 02:28:23 +0000
@@ -4,11 +4,11 @@
 package main
 
 import (
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/cmd/envcmd"
-	"launchpad.net/juju-core/errors"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/testing"
 
=== modified file 'cmd/jujud/agent.go'
--- cmd/jujud/agent.go	2014-05-13 23:18:30 +0000
+++ cmd/jujud/agent.go	2014-05-15 02:28:23 +0000
@@ -10,11 +10,11 @@
 	"sync"
 	"time"
 
+	"github.com/juju/errors"
 	"launchpad.net/gnuflag"
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/cmd"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 
=== modified file 'cmd/jujud/bootstrap_test.go'
--- cmd/jujud/bootstrap_test.go	2014-05-08 07:04:54 +0000
+++ cmd/jujud/bootstrap_test.go	2014-05-15 02:28:23 +0000
@@ -9,6 +9,7 @@
 	"io"
 	"io/ioutil"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 	"launchpad.net/goyaml"
@@ -20,7 +21,6 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/provider/dummy"
 
=== modified file 'cmd/jujud/machine.go'
--- cmd/jujud/machine.go	2014-05-13 23:18:30 +0000
+++ cmd/jujud/machine.go	2014-05-15 02:28:23 +0000
@@ -11,6 +11,7 @@
 	"runtime"
 	"time"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"labix.org/v2/mgo"
 	"launchpad.net/gnuflag"
@@ -22,7 +23,6 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/container/kvm"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/provider"
 
=== modified file 'cmd/jujud/machine_test.go'
--- cmd/jujud/machine_test.go	2014-04-18 04:39:58 +0000
+++ cmd/jujud/machine_test.go	2014-05-15 02:28:23 +0000
@@ -12,6 +12,7 @@
 	"sync"
 	"time"
 
+	"github.com/juju/errors"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
@@ -23,7 +24,6 @@
 	lxctesting "launchpad.net/juju-core/container/lxc/testing"
 	"launchpad.net/juju-core/environs/config"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/juju/osenv"
 
=== modified file 'constraints/constraints.go'
--- constraints/constraints.go	2014-04-24 11:52:09 +0000
+++ constraints/constraints.go	2014-05-15 02:28:23 +0000
@@ -10,7 +10,7 @@
 	"strconv"
 	"strings"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/arch"
@@ -274,7 +274,7 @@
 		return fmt.Errorf("unknown constraint %q", name)
 	}
 	if err != nil {
-		return errgo.Annotatef(err, "bad %q constraint", name)
+		return errors.Annotatef(err, "bad %q constraint", name)
 	}
 	return nil
 }
 
=== modified file 'container/kvm/container.go'
--- container/kvm/container.go	2014-04-17 03:41:32 +0000
+++ container/kvm/container.go	2014-05-15 02:28:23 +0000
@@ -6,8 +6,9 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/container"
-	"launchpad.net/juju-core/errors"
 )
 
 type kvmContainer struct {
 
=== modified file 'container/kvm/kvm.go'
--- container/kvm/kvm.go	2014-05-13 11:37:40 +0000
+++ container/kvm/kvm.go	2014-05-15 02:28:23 +0000
@@ -8,13 +8,13 @@
 	"os/exec"
 	"strings"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/container"
 	"launchpad.net/juju-core/environs/cloudinit"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/version"
 
=== modified file 'container/lxc/instance.go'
--- container/lxc/instance.go	2014-04-14 12:36:13 +0000
+++ container/lxc/instance.go	2014-05-15 02:28:23 +0000
@@ -6,9 +6,9 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
 	"launchpad.net/golxc"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 )
 
 
=== modified file 'dependencies.tsv'
--- dependencies.tsv	2014-05-13 11:37:40 +0000
+++ dependencies.tsv	2014-05-15 02:28:23 +0000
@@ -1,10 +1,11 @@
 code.google.com/p/go.crypto	hg	6478cc9340cbbe6c04511280c5007722269108e9	184
 code.google.com/p/go.net	hg	c17ad62118ea511e1051721b429779fa40bddc74	116
-github.com/errgo/errgo	git	93d72bf813883d1054cae1c001d3a46603f7f559	
 github.com/joyent/gocommon	git	98b151a080efe19bcde223d2d3b04389963d2347	
 github.com/joyent/gomanta	git	ff785814c0ebb4050420a2f1d47895b35b8808f2	
 github.com/joyent/gosdc	git	10bbe92c5d98c8b38a0b7f62ee042c7252150efc	
 github.com/joyent/gosign	git	476720af5427223da5420afbbadf620bfb760345	
+github.com/juju/errgo	git	96d8f88c102000c1e7150b957c7c493911519338	
+github.com/juju/errors	git	075df0417dbcc39d24ee18248d2f8d6e3eed598b	
 github.com/juju/loggo	git	fa3acf9ab9ed09aea29030558528e24a254d27af	
 github.com/juju/ratelimit	git	0025ab75db6c6eaa4ffff0240c2c9e617ad1a0eb	
 github.com/juju/testing	git	9c0e0686136637876ae659e9056897575236e11f	
 
=== modified file 'environs/bootstrap/state.go'
--- environs/bootstrap/state.go	2014-04-14 12:36:13 +0000
+++ environs/bootstrap/state.go	2014-05-15 02:28:23 +0000
@@ -9,11 +9,11 @@
 	"io"
 	"io/ioutil"
 
+	"github.com/juju/errors"
 	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/storage"
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 )
 
@@ -65,7 +65,7 @@
 func LoadState(stor storage.StorageReader) (*BootstrapState, error) {
 	r, err := storage.Get(stor, StateFile)
 	if err != nil {
-		if coreerrors.IsNotFound(err) {
+		if errors.IsNotFound(err) {
 			return nil, environs.ErrNotBootstrapped
 		}
 		return nil, err
 
=== modified file 'environs/bootstrap/synctools.go'
--- environs/bootstrap/synctools.go	2014-05-13 23:18:30 +0000
+++ environs/bootstrap/synctools.go	2014-05-15 02:28:23 +0000
@@ -7,11 +7,12 @@
 	"fmt"
 	"os"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/sync"
 	envtools "launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/arch"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils/set"
 
=== modified file 'environs/cloudinit.go'
--- environs/cloudinit.go	2014-04-23 08:50:28 +0000
+++ environs/cloudinit.go	2014-05-15 02:28:23 +0000
@@ -6,14 +6,13 @@
 import (
 	"fmt"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 
 	"launchpad.net/juju-core/agent"
 	coreCloudinit "launchpad.net/juju-core/cloudinit"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/cloudinit"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state"
@@ -141,7 +140,7 @@
 	// These really are directly relevant to running a state server.
 	cert, key, err := cfg.GenerateStateServerCertAndKey()
 	if err != nil {
-		return errgo.Annotate(err, "cannot generate state server certificate")
+		return errors.Annotate(err, "cannot generate state server certificate")
 	}
 
 	srvInfo := params.StateServingInfo{
 
=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2014-04-23 08:50:28 +0000
+++ environs/cloudinit/cloudinit.go	2014-05-15 02:28:23 +0000
@@ -10,7 +10,7 @@
 	"path"
 	"strings"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/agent"
@@ -18,7 +18,6 @@
 	"launchpad.net/juju-core/cloudinit"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/names"
@@ -405,7 +404,7 @@
 	acfg.SetValue(agent.AgentServiceName, cfg.MachineAgentServiceName)
 	cmds, err := acfg.WriteCommands()
 	if err != nil {
-		return nil, errgo.Annotate(err, "failed to write commands")
+		return nil, errors.Annotate(err, "failed to write commands")
 	}
 	c.AddScripts(cmds...)
 	return acfg, nil
@@ -423,7 +422,7 @@
 	conf := upstart.MachineAgentUpstartService(name, toolsDir, cfg.DataDir, cfg.LogDir, tag, machineId, nil)
 	cmds, err := conf.InstallCommands()
 	if err != nil {
-		return errgo.Annotatef(err, "cannot make cloud-init upstart script for the %s agent", tag)
+		return errors.Annotatef(err, "cannot make cloud-init upstart script for the %s agent", tag)
 	}
 	c.AddRunCmd(cloudinit.LogProgressCmd("Starting Juju machine agent (%s)", name))
 	c.AddScripts(cmds...)
 
=== modified file 'environs/config.go'
--- environs/config.go	2014-03-07 23:03:04 +0000
+++ environs/config.go	2014-05-15 02:28:23 +0000
@@ -9,11 +9,11 @@
 	"os"
 	"path/filepath"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/osenv"
 )
 
 
=== modified file 'environs/config/config.go'
--- environs/config/config.go	2014-05-09 13:24:50 +0000
+++ environs/config/config.go	2014-05-15 02:28:23 +0000
@@ -13,7 +13,7 @@
 	"strings"
 	"time"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/cert"
@@ -320,7 +320,7 @@
 	caKey, caKeyOK := cfg.CAPrivateKey()
 	if caCertOK || caKeyOK {
 		if err := verifyKeyPair(caCert, caKey); err != nil {
-			return errgo.Annotate(err, "bad CA certificate/key in configuration")
+			return errors.Annotate(err, "bad CA certificate/key in configuration")
 		}
 	}
 
 
=== modified file 'environs/configstore/disk.go'
--- environs/configstore/disk.go	2014-04-30 23:18:40 +0000
+++ environs/configstore/disk.go	2014-05-15 02:28:23 +0000
@@ -9,11 +9,10 @@
 	"os"
 	"path/filepath"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"launchpad.net/goyaml"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/utils"
 )
@@ -173,14 +172,14 @@
 func (info *environInfo) Write() error {
 	data, err := goyaml.Marshal(info.EnvInfo)
 	if err != nil {
-		return errgo.Annotate(err, "cannot marshal environment info")
+		return errors.Annotate(err, "cannot marshal environment info")
 	}
 	// Create a temporary file and rename it, so that the data
 	// changes atomically.
 	parent, _ := filepath.Split(info.path)
 	tmpFile, err := ioutil.TempFile(parent, "")
 	if err != nil {
-		return errgo.Annotate(err, "cannot create temporary file")
+		return errors.Annotate(err, "cannot create temporary file")
 	}
 	_, err = tmpFile.Write(data)
 	// N.B. We need to close the file before renaming it
@@ -188,11 +187,11 @@
 	// error.
 	tmpFile.Close()
 	if err != nil {
-		return errgo.Annotate(err, "cannot write temporary file")
+		return errors.Annotate(err, "cannot write temporary file")
 	}
 	if err := utils.ReplaceFile(tmpFile.Name(), info.path); err != nil {
 		os.Remove(tmpFile.Name())
-		return errgo.Annotate(err, "cannot rename new environment info file")
+		return errors.Annotate(err, "cannot rename new environment info file")
 	}
 	info.initialized = true
 	return nil
 
=== modified file 'environs/configstore/disk_test.go'
--- environs/configstore/disk_test.go	2014-04-14 12:36:13 +0000
+++ environs/configstore/disk_test.go	2014-05-15 02:28:23 +0000
@@ -12,11 +12,11 @@
 	"strings"
 	"syscall"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/configstore"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/testing/testbase"
 )
 
 
=== modified file 'environs/configstore/mem.go'
--- environs/configstore/mem.go	2014-03-27 17:05:00 +0000
+++ environs/configstore/mem.go	2014-05-15 02:28:23 +0000
@@ -7,7 +7,7 @@
 	"fmt"
 	"sync"
 
-	"launchpad.net/juju-core/errors"
+	"github.com/juju/errors"
 )
 
 type memStore struct {
 
=== modified file 'environs/emptystorage.go'
--- environs/emptystorage.go	2013-10-03 01:28:51 +0000
+++ environs/emptystorage.go	2014-05-15 02:28:23 +0000
@@ -7,8 +7,9 @@
 	"fmt"
 	"io"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 )
 
 
=== modified file 'environs/emptystorage_test.go'
--- environs/emptystorage_test.go	2014-02-13 02:46:58 +0000
+++ environs/emptystorage_test.go	2014-05-15 02:28:23 +0000
@@ -6,12 +6,12 @@
 import (
 	"io/ioutil"
 
+	"github.com/juju/errors"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/configstore"
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/testing/testbase"
 
=== modified file 'environs/filestorage/filestorage.go'
--- environs/filestorage/filestorage.go	2014-04-30 23:18:40 +0000
+++ environs/filestorage/filestorage.go	2014-05-15 02:28:23 +0000
@@ -12,8 +12,9 @@
 	"sort"
 	"strings"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/environs/storage"
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 )
 
@@ -60,11 +61,11 @@
 	fi, err := os.Stat(filename)
 	if err != nil {
 		if os.IsNotExist(err) {
-			err = coreerrors.NewNotFound(err, "")
+			err = errors.NewNotFound(err, "")
 		}
 		return nil, err
 	} else if fi.IsDir() {
-		return nil, coreerrors.NotFoundf("no such file with name %q", name)
+		return nil, errors.NotFoundf("no such file with name %q", name)
 	}
 	file, err := os.Open(filename)
 	if err != nil {
 
=== modified file 'environs/filestorage/filestorage_test.go'
--- environs/filestorage/filestorage_test.go	2014-04-14 12:36:13 +0000
+++ environs/filestorage/filestorage_test.go	2014-05-15 02:28:23 +0000
@@ -15,12 +15,12 @@
 	"strings"
 	"testing"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/filestorage"
 	"launchpad.net/juju-core/environs/storage"
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/osenv"
 )
 
@@ -132,12 +132,12 @@
 
 	// Get on a non-existant path returns errors.NotFound
 	_, err = s.reader.Get("nowhere")
-	c.Assert(err, jc.Satisfies, coreerrors.IsNotFound)
+	c.Assert(err, jc.Satisfies, errors.IsNotFound)
 
 	// Get on a directory returns errors.NotFound
 	s.createFile(c, "dir/file")
 	_, err = s.reader.Get("dir")
-	c.Assert(err, jc.Satisfies, coreerrors.IsNotFound)
+	c.Assert(err, jc.Satisfies, errors.IsNotFound)
 }
 
 func (s *filestorageSuite) TestGetRefusesTemp(c *gc.C) {
 
=== modified file 'environs/httpstorage/storage.go'
--- environs/httpstorage/storage.go	2014-04-30 23:18:40 +0000
+++ environs/httpstorage/storage.go	2014-05-15 02:28:23 +0000
@@ -6,7 +6,6 @@
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -16,10 +15,10 @@
 	"strings"
 	"sync"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/environs/storage"
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 )
 
@@ -96,7 +95,7 @@
 		return nil, err
 	}
 	if resp.StatusCode != http.StatusOK {
-		return nil, coreerrors.NotFoundf("file %q", name)
+		return nil, errors.NotFoundf("file %q", name)
 	}
 	return resp.Body, nil
 }
 
=== modified file 'environs/httpstorage/storage_test.go'
--- environs/httpstorage/storage_test.go	2014-04-14 12:36:13 +0000
+++ environs/httpstorage/storage_test.go	2014-05-15 02:28:23 +0000
@@ -11,12 +11,12 @@
 	"net/http"
 	"path/filepath"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/httpstorage"
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 	coretesting "launchpad.net/juju-core/testing"
 )
 
 
=== modified file 'environs/imagemetadata/generate.go'
--- environs/imagemetadata/generate.go	2014-05-13 23:18:30 +0000
+++ environs/imagemetadata/generate.go	2014-05-15 02:28:23 +0000
@@ -9,9 +9,10 @@
 	"path/filepath"
 	"time"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/version/ubuntu"
 )
 
 
=== modified file 'environs/jujutest/livetests.go'
--- environs/jujutest/livetests.go	2014-05-14 02:59:53 +0000
+++ environs/jujutest/livetests.go	2014-05-15 02:28:23 +0000
@@ -11,6 +11,7 @@
 	"strings"
 	"time"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
@@ -24,7 +25,6 @@
 	"launchpad.net/juju-core/environs/sync"
 	envtesting "launchpad.net/juju-core/environs/testing"
 	envtools "launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/juju/testing"
 
=== modified file 'environs/jujutest/tests.go'
--- environs/jujutest/tests.go	2014-05-14 02:59:53 +0000
+++ environs/jujutest/tests.go	2014-05-15 02:28:23 +0000
@@ -9,6 +9,7 @@
 	"net/http"
 	"sort"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
@@ -18,7 +19,6 @@
 	"launchpad.net/juju-core/environs/configstore"
 	"launchpad.net/juju-core/environs/storage"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	coretesting "launchpad.net/juju-core/testing"
 
=== modified file 'environs/open.go'
--- environs/open.go	2014-04-14 12:36:13 +0000
+++ environs/open.go	2014-05-15 02:28:23 +0000
@@ -9,13 +9,12 @@
 	"strings"
 	"time"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 
 	"launchpad.net/juju-core/cert"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 )
 
 // File named `VerificationFilename` in the storage will contain
@@ -274,7 +273,7 @@
 		return err
 	}
 	if err := info.Destroy(); err != nil {
-		return errgo.Annotate(err, "cannot destroy environment configuration information")
+		return errors.Annotate(err, "cannot destroy environment configuration information")
 	}
 	return nil
 }
 
=== modified file 'environs/open_test.go'
--- environs/open_test.go	2014-04-24 02:27:38 +0000
+++ environs/open_test.go	2014-05-15 02:28:23 +0000
@@ -6,6 +6,7 @@
 import (
 	"strings"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
@@ -15,7 +16,6 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/testing/testbase"
 
=== modified file 'environs/simplestreams/datasource.go'
--- environs/simplestreams/datasource.go	2014-03-21 03:27:16 +0000
+++ environs/simplestreams/datasource.go	2014-05-15 02:28:23 +0000
@@ -9,7 +9,8 @@
 	"net/http"
 	"strings"
 
-	"launchpad.net/juju-core/errors"
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/utils"
 )
 
 
=== modified file 'environs/simplestreams/simplestreams.go'
--- environs/simplestreams/simplestreams.go	2014-05-13 23:18:30 +0000
+++ environs/simplestreams/simplestreams.go	2014-05-15 02:28:23 +0000
@@ -18,9 +18,9 @@
 	"sort"
 	"strings"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 )
 
 
=== modified file 'environs/sshstorage/storage.go'
--- environs/sshstorage/storage.go	2014-04-14 12:36:13 +0000
+++ environs/sshstorage/storage.go	2014-05-15 02:28:23 +0000
@@ -7,7 +7,6 @@
 	"bufio"
 	"bytes"
 	"encoding/base64"
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -16,9 +15,9 @@
 	"strconv"
 	"strings"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/utils/ssh"
 )
@@ -253,7 +252,7 @@
 	if err != nil {
 		err := err.(SSHStorageError)
 		if strings.Contains(err.Output, "No such file") {
-			return nil, coreerrors.NewNotFound(err, "")
+			return nil, errors.NewNotFound(err, "")
 		}
 		return nil, err
 	}
 
=== modified file 'environs/sshstorage/storage_test.go'
--- environs/sshstorage/storage_test.go	2014-04-14 12:36:13 +0000
+++ environs/sshstorage/storage_test.go	2014-05-15 02:28:23 +0000
@@ -16,12 +16,12 @@
 	"strings"
 	"time"
 
+	"github.com/juju/errors"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/storage"
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/utils/ssh"
@@ -164,7 +164,7 @@
 		c.Assert(out, gc.DeepEquals, data)
 	}
 	_, err = storage.Get(stor, "notthere")
-	c.Assert(err, jc.Satisfies, coreerrors.IsNotFound)
+	c.Assert(err, jc.Satisfies, errors.IsNotFound)
 }
 
 func (s *storageSuite) TestWriteFailure(c *gc.C) {
 
=== modified file 'environs/tools/simplestreams.go'
--- environs/tools/simplestreams.go	2014-05-13 23:18:30 +0000
+++ environs/tools/simplestreams.go	2014-05-15 02:28:23 +0000
@@ -17,9 +17,10 @@
 	"strings"
 	"time"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils/set"
 	"launchpad.net/juju-core/version"
 
=== modified file 'environs/tools/tools.go'
--- environs/tools/tools.go	2014-05-13 23:18:30 +0000
+++ environs/tools/tools.go	2014-05-15 02:28:23 +0000
@@ -6,11 +6,11 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/simplestreams"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/arch"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 
=== modified file 'environs/tools/tools_test.go'
--- environs/tools/tools_test.go	2014-04-14 12:36:13 +0000
+++ environs/tools/tools_test.go	2014-05-15 02:28:23 +0000
@@ -8,6 +8,7 @@
 	"os"
 	"path/filepath"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
@@ -18,7 +19,6 @@
 	envtesting "launchpad.net/juju-core/environs/testing"
 	envtools "launchpad.net/juju-core/environs/tools"
 	ttesting "launchpad.net/juju-core/environs/tools/testing"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/testing/testbase"
 
=== removed directory 'errors'
=== removed file 'errors/errors.go'
--- errors/errors.go	2014-04-17 12:53:23 +0000
+++ errors/errors.go	1970-01-01 00:00:00 +0000
@@ -1,210 +0,0 @@
-// Copyright 2013 Canonical Ltd.
-// Licensed under the AGPLv3, see LICENCE file for details.
-
-package errors
-
-import (
-	"fmt"
-
-	"github.com/juju/loggo"
-)
-
-// wrapper defines a way to encapsulate an error inside another error.
-type wrapper struct {
-	// Err is the underlying error.
-	err error
-
-	// Msg is the annotation (prefix) of Err.
-	msg string
-}
-
-// newer is implemented by error types that can add a context message
-// while preserving their type.
-type newer interface {
-	new(msg string) error
-}
-
-// Error implements the error interface.
-func (e *wrapper) Error() string {
-	if e.msg != "" || e.err == nil {
-		if e.err != nil {
-			return fmt.Sprintf("%s: %v", e.msg, e.err.Error())
-		}
-		return e.msg
-	}
-	return e.err.Error()
-}
-
-// wrap is a helper to construct an *wrapper.
-func wrap(err error, format, suffix string, args ...interface{}) wrapper {
-	return wrapper{err, fmt.Sprintf(format+suffix, args...)}
-}
-
-// Contextf prefixes any error stored in err with text formatted
-// according to the format specifier. If err does not contain an
-// error, Contextf does nothing. All errors created with functions
-// from this package are preserved when wrapping.
-func Contextf(err *error, format string, args ...interface{}) {
-	if *err == nil {
-		return
-	}
-	msg := fmt.Sprintf(format, args...)
-	errNewer, ok := (*err).(newer)
-	if ok {
-		*err = errNewer.new(msg)
-		return
-	}
-	*err = fmt.Errorf("%s: %v", msg, *err)
-}
-
-// Maskf masks the given error (when it is not nil) with the given
-// format string and arguments (like fmt.Sprintf), returning a new
-// error. If *err is nil, Maskf does nothing.
-func Maskf(err *error, format string, args ...interface{}) {
-	if *err == nil {
-		return
-	}
-	*err = fmt.Errorf("%s: %v", fmt.Sprintf(format, args...), *err)
-}
-
-// notFound represents an error when something has not been found.
-type notFound struct {
-	wrapper
-}
-
-func (e *notFound) new(msg string) error {
-	return NewNotFound(e, msg)
-}
-
-// NotFoundf returns an error which satisfies IsNotFound().
-func NotFoundf(format string, args ...interface{}) error {
-	return &notFound{wrap(nil, format, " not found", args...)}
-}
-
-// NewNotFound returns an error which wraps err that satisfies
-// IsNotFound().
-func NewNotFound(err error, msg string) error {
-	return &notFound{wrap(err, msg, "")}
-}
-
-// IsNotFound reports whether err was created with NotFoundf() or
-// NewNotFound().
-func IsNotFound(err error) bool {
-	_, ok := err.(*notFound)
-	return ok
-}
-
-// unauthorized represents an error when an operation is unauthorized.
-type unauthorized struct {
-	wrapper
-}
-
-func (e *unauthorized) new(msg string) error {
-	return NewUnauthorized(e, msg)
-}
-
-// Unauthorizedf returns an error which satisfies IsUnauthorized().
-func Unauthorizedf(format string, args ...interface{}) error {
-	return &unauthorized{wrap(nil, format, "", args...)}
-}
-
-// NewUnauthorized returns an error which wraps err and satisfies
-// IsUnauthorized().
-func NewUnauthorized(err error, msg string) error {
-	return &unauthorized{wrap(err, msg, "")}
-}
-
-// IsUnauthorized reports whether err was created with Unauthorizedf() or
-// NewUnauthorized().
-func IsUnauthorized(err error) bool {
-	_, ok := err.(*unauthorized)
-	return ok
-}
-
-// notImplemented represents an error when something is not
-// implemented.
-type notImplemented struct {
-	wrapper
-}
-
-func (e *notImplemented) new(msg string) error {
-	return NewNotImplemented(e, msg)
-}
-
-// NotImplementedf returns an error which satisfies IsNotImplemented().
-func NotImplementedf(format string, args ...interface{}) error {
-	return &notImplemented{wrap(nil, format, " not implemented", args...)}
-}
-
-// NewNotImplemented returns an error which wraps err and satisfies
-// IsNotImplemented().
-func NewNotImplemented(err error, msg string) error {
-	return &notImplemented{wrap(err, msg, "")}
-}
-
-// IsNotImplemented reports whether err was created with
-// NotImplementedf() or NewNotImplemented().
-func IsNotImplemented(err error) bool {
-	_, ok := err.(*notImplemented)
-	return ok
-}
-
-// alreadyExists represents and error when something already exists.
-type alreadyExists struct {
-	wrapper
-}
-
-func (e *alreadyExists) new(msg string) error {
-	return NewAlreadyExists(e, msg)
-}
-
-// AlreadyExistsf returns an error which satisfies IsAlreadyExists().
-func AlreadyExistsf(format string, args ...interface{}) error {
-	return &alreadyExists{wrap(nil, format, " already exists", args...)}
-}
-
-// NewAlreadyExists returns an error which wraps err and satisfies
-// IsAlreadyExists().
-func NewAlreadyExists(err error, msg string) error {
-	return &alreadyExists{wrap(err, msg, "")}
-}
-
-// IsAlreadyExists reports whether the error was created with
-// AlreadyExistsf() or NewAlreadyExists().
-func IsAlreadyExists(err error) bool {
-	_, ok := err.(*alreadyExists)
-	return ok
-}
-
-// notSupported represents an error when something is not supported.
-type notSupported struct {
-	wrapper
-}
-
-func (e *notSupported) new(msg string) error {
-	return NewNotSupported(e, msg)
-}
-
-// NotSupportedf returns an error which satisfies IsNotSupported().
-func NotSupportedf(format string, args ...interface{}) error {
-	return &notSupported{wrap(nil, format, " not supported", args...)}
-}
-
-// NewNotSupported returns an error which wraps err and satisfies
-// IsNotSupported().
-func NewNotSupported(err error, msg string) error {
-	return &notSupported{wrap(err, msg, "")}
-}
-
-// IsNotSupported reports whether the error was created with
-// NotSupportedf() or NewNotSupported().
-func IsNotSupported(err error) bool {
-	_, ok := err.(*notSupported)
-	return ok
-}
-
-// LoggedErrorf logs the error and return an error with the same text.
-func LoggedErrorf(logger loggo.Logger, format string, a ...interface{}) error {
-	logger.Logf(loggo.ERROR, format, a...)
-	return fmt.Errorf(format, a...)
-}
 
=== removed file 'errors/errors_test.go'
--- errors/errors_test.go	2014-04-17 14:59:02 +0000
+++ errors/errors_test.go	1970-01-01 00:00:00 +0000
@@ -1,209 +0,0 @@
-// Copyright 2013 Canonical Ltd.
-// Licensed under the AGPLv3, see LICENCE file for details.
-
-package errors_test
-
-import (
-	stderrors "errors"
-	"fmt"
-	"reflect"
-	"runtime"
-	"testing"
-
-	jc "github.com/juju/testing/checkers"
-	gc "launchpad.net/gocheck"
-
-	"launchpad.net/juju-core/errors"
-)
-
-// errorInfo holds information about a single error type: a satisfier
-// function, wrapping and variable arguments constructors and message
-// suffix.
-type errorInfo struct {
-	satisfier       func(error) bool
-	argsConstructor func(string, ...interface{}) error
-	wrapConstructor func(error, string) error
-	suffix          string
-}
-
-// allErrors holds information for all defined errors. When adding new
-// errors, add them here as well to include them in tests.
-var allErrors = []*errorInfo{
-	&errorInfo{errors.IsNotFound, errors.NotFoundf, errors.NewNotFound, " not found"},
-	&errorInfo{errors.IsUnauthorized, errors.Unauthorizedf, errors.NewUnauthorized, ""},
-	&errorInfo{errors.IsNotImplemented, errors.NotImplementedf, errors.NewNotImplemented, " not implemented"},
-	&errorInfo{errors.IsAlreadyExists, errors.AlreadyExistsf, errors.NewAlreadyExists, " already exists"},
-	&errorInfo{errors.IsNotSupported, errors.NotSupportedf, errors.NewNotSupported, " not supported"},
-}
-
-type errorsSuite struct{}
-
-var _ = gc.Suite(&errorsSuite{})
-
-func Test(t *testing.T) {
-	gc.TestingT(t)
-}
-
-func (t *errorInfo) satisfierName() string {
-	value := reflect.ValueOf(t.satisfier)
-	f := runtime.FuncForPC(value.Pointer())
-	return f.Name()
-}
-
-func (t *errorInfo) equal(t0 *errorInfo) bool {
-	if t0 == nil {
-		return false
-	}
-	return t.satisfierName() == t0.satisfierName()
-}
-
-type errorTest struct {
-	err     error
-	message string
-	errInfo *errorInfo
-}
-
-func contextf(err error, format string, args ...interface{}) error {
-	errors.Contextf(&err, format, args...)
-	return err
-}
-
-func maskf(err error, format string, args ...interface{}) error {
-	errors.Maskf(&err, format, args...)
-	return err
-}
-
-func mustSatisfy(c *gc.C, err error, errInfo *errorInfo) {
-	if errInfo != nil {
-		msg := fmt.Sprintf("%#v must satisfy %v", err, errInfo.satisfierName())
-		c.Check(err, jc.Satisfies, errInfo.satisfier, gc.Commentf(msg))
-	}
-}
-
-func mustNotSatisfy(c *gc.C, err error, errInfo *errorInfo) {
-	if errInfo != nil {
-		msg := fmt.Sprintf("%#v must not satisfy %v", err, errInfo.satisfierName())
-		c.Check(err, gc.Not(jc.Satisfies), errInfo.satisfier, gc.Commentf(msg))
-	}
-}
-
-func checkErrorMatches(c *gc.C, err error, message string, errInfo *errorInfo) {
-	if message == "<nil>" {
-		c.Check(err, gc.IsNil)
-		c.Check(errInfo, gc.IsNil)
-	} else {
-		c.Check(err, gc.ErrorMatches, message)
-	}
-}
-
-func runErrorTests(c *gc.C, errorTests []errorTest, checkMustSatisfy bool) {
-	for i, t := range errorTests {
-		c.Logf("test %d: %T: %v", i, t.err, t.err)
-		checkErrorMatches(c, t.err, t.message, t.errInfo)
-		if checkMustSatisfy {
-			mustSatisfy(c, t.err, t.errInfo)
-		}
-
-		// Check all other satisfiers to make sure none match.
-		for _, otherErrInfo := range allErrors {
-			if checkMustSatisfy && otherErrInfo.equal(t.errInfo) {
-				continue
-			}
-			mustNotSatisfy(c, t.err, otherErrInfo)
-		}
-	}
-}
-
-func (*errorsSuite) TestMaskf(c *gc.C) {
-	// Ensure Maskf masks all known errors and their satisfiers don't
-	// succeed.
-	errorTests := []errorTest{}
-	for _, errInfo := range allErrors {
-		errorTests = append(errorTests, []errorTest{{
-			maskf(nil, "masked"),
-			"<nil>",
-			nil,
-		}, {
-			maskf(stderrors.New("blast"), "masked"),
-			"masked: blast",
-			nil,
-		}, {
-			maskf(errInfo.argsConstructor("foo %d", 42), "masked %d", 69),
-			"masked 69: foo 42" + errInfo.suffix,
-			errInfo,
-		}, {
-			maskf(errInfo.argsConstructor(""), "masked"),
-			"masked: " + errInfo.suffix,
-			errInfo,
-		}, {
-			maskf(errInfo.wrapConstructor(stderrors.New("pow!"), "woo"), "masked"),
-			"masked: woo: pow!",
-			errInfo,
-		}}...)
-	}
-
-	runErrorTests(c, errorTests, false)
-}
-
-func (*errorsSuite) TestContextf(c *gc.C) {
-	// Ensure Contextf masks only unknown error types, but passes through known ones.
-	errorTests := []errorTest{}
-	for _, errInfo := range allErrors {
-		errorTests = append(errorTests, []errorTest{{
-			contextf(nil, "prefix"),
-			"<nil>",
-			nil,
-		}, {
-			contextf(stderrors.New("blast"), "prefix"),
-			"prefix: blast",
-			nil,
-		}, {
-			contextf(errInfo.argsConstructor("foo %d", 42), "prefix %d", 69),
-			"prefix 69: foo 42" + errInfo.suffix,
-			errInfo,
-		}, {
-			contextf(errInfo.argsConstructor(""), "prefix"),
-			"prefix: " + errInfo.suffix,
-			errInfo,
-		}, {
-			contextf(errInfo.wrapConstructor(stderrors.New("pow!"), "woo"), "prefix"),
-			"prefix: woo: pow!",
-			errInfo,
-		}}...)
-	}
-
-	runErrorTests(c, errorTests, true)
-}
-
-func (*errorsSuite) TestAllErrors(c *gc.C) {
-	errorTests := []errorTest{}
-	for _, errInfo := range allErrors {
-		errorTests = append(errorTests, []errorTest{{
-			nil,
-			"<nil>",
-			nil,
-		}, {
-			errInfo.argsConstructor("foo %d", 42),
-			"foo 42" + errInfo.suffix,
-			errInfo,
-		}, {
-			errInfo.argsConstructor(""),
-			errInfo.suffix,
-			errInfo,
-		}, {
-			errInfo.wrapConstructor(stderrors.New("pow!"), "prefix"),
-			"prefix: pow!",
-			errInfo,
-		}, {
-			errInfo.wrapConstructor(stderrors.New("pow!"), ""),
-			"pow!",
-			errInfo,
-		}, {
-			errInfo.wrapConstructor(nil, "prefix"),
-			"prefix",
-			errInfo,
-		}}...)
-	}
-
-	runErrorTests(c, errorTests, true)
-}
 
=== modified file 'juju/api.go'
--- juju/api.go	2014-04-25 14:10:09 +0000
+++ juju/api.go	2014-05-15 02:28:23 +0000
@@ -8,10 +8,11 @@
 	"io"
 	"time"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state/api"
 
=== modified file 'juju/apiconn_test.go'
--- juju/apiconn_test.go	2014-04-25 13:57:06 +0000
+++ juju/apiconn_test.go	2014-05-15 02:28:23 +0000
@@ -8,6 +8,7 @@
 	"os"
 	"time"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
@@ -16,7 +17,6 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/juju/osenv"
 
=== modified file 'juju/conn.go'
--- juju/conn.go	2014-04-17 12:53:23 +0000
+++ juju/conn.go	2014-05-15 02:28:23 +0000
@@ -11,12 +11,12 @@
 	"os"
 	"time"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/configstore"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/utils"
 
=== modified file 'juju/conn_test.go'
--- juju/conn_test.go	2014-04-24 02:27:38 +0000
+++ juju/conn_test.go	2014-05-15 02:28:23 +0000
@@ -12,6 +12,7 @@
 	"strings"
 	stdtesting "testing"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
@@ -22,7 +23,6 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/configstore"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/juju/osenv"
 
=== modified file 'provider/azure/certfile.go'
--- provider/azure/certfile.go	2014-04-17 12:47:50 +0000
+++ provider/azure/certfile.go	2014-05-15 02:28:23 +0000
@@ -7,7 +7,7 @@
 	"os"
 	"path"
 
-	"launchpad.net/juju-core/errors"
+	"github.com/juju/errors"
 )
 
 // tempCertFile is a temporary file containing an x509 certificate.
 
=== modified file 'provider/azure/environ.go'
--- provider/azure/environ.go	2014-05-14 02:59:53 +0000
+++ provider/azure/environ.go	2014-05-15 02:28:23 +0000
@@ -12,6 +12,7 @@
 	"sync"
 	"time"
 
+	"github.com/juju/errors"
 	"launchpad.net/gwacl"
 
 	"launchpad.net/juju-core/constraints"
@@ -23,7 +24,6 @@
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/provider/common"
 	"launchpad.net/juju-core/state"
 
=== modified file 'provider/azure/instance.go'
--- provider/azure/instance.go	2014-04-09 06:35:07 +0000
+++ provider/azure/instance.go	2014-05-15 02:28:23 +0000
@@ -8,9 +8,9 @@
 	"strings"
 	"sync"
 
+	"github.com/juju/errors"
 	"launchpad.net/gwacl"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/provider/common"
 	"launchpad.net/juju-core/worker/firewaller"
 
=== modified file 'provider/azure/instancetype.go'
--- provider/azure/instancetype.go	2014-04-14 12:36:13 +0000
+++ provider/azure/instancetype.go	2014-05-15 02:28:23 +0000
@@ -7,13 +7,13 @@
 	"fmt"
 	"sort"
 
+	"github.com/juju/errors"
 	"launchpad.net/gwacl"
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/instances"
 	"launchpad.net/juju-core/environs/simplestreams"
-	"launchpad.net/juju-core/errors"
 )
 
 // preferredTypes is a list of machine types, in order of preference so that
 
=== modified file 'provider/azure/storage.go'
--- provider/azure/storage.go	2014-04-30 01:16:45 +0000
+++ provider/azure/storage.go	2014-05-15 02:28:23 +0000
@@ -9,10 +9,10 @@
 	"sync"
 	"time"
 
+	"github.com/juju/errors"
 	"launchpad.net/gwacl"
 
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 )
 
 
=== modified file 'provider/azure/storage_test.go'
--- provider/azure/storage_test.go	2014-04-14 12:36:13 +0000
+++ provider/azure/storage_test.go	2014-05-15 02:28:23 +0000
@@ -11,12 +11,12 @@
 	"net/url"
 	"strings"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 	"launchpad.net/gwacl"
 
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 )
 
 type storageSuite struct {
 
=== modified file 'provider/common/destroy_test.go'
--- provider/common/destroy_test.go	2014-05-13 11:37:40 +0000
+++ provider/common/destroy_test.go	2014-05-15 02:28:23 +0000
@@ -7,11 +7,11 @@
 	"fmt"
 	"strings"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/provider/common"
 	"launchpad.net/juju-core/testing/testbase"
 
=== modified file 'provider/dummy/storage.go'
--- provider/dummy/storage.go	2014-01-31 00:14:11 +0000
+++ provider/dummy/storage.go	2014-05-15 02:28:23 +0000
@@ -13,8 +13,9 @@
 	"strings"
 	"time"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 )
 
 
=== modified file 'provider/ec2/ec2.go'
--- provider/ec2/ec2.go	2014-05-14 02:59:53 +0000
+++ provider/ec2/ec2.go	2014-05-15 02:28:23 +0000
@@ -8,6 +8,7 @@
 	"sync"
 	"time"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"launchpad.net/goamz/aws"
 	"launchpad.net/goamz/ec2"
@@ -22,7 +23,6 @@
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/arch"
 	"launchpad.net/juju-core/provider/common"
 
=== modified file 'provider/ec2/storage.go'
--- provider/ec2/storage.go	2014-04-30 23:18:40 +0000
+++ provider/ec2/storage.go	2014-05-15 02:28:23 +0000
@@ -10,10 +10,10 @@
 	"sync"
 	"time"
 
+	"github.com/juju/errors"
 	"launchpad.net/goamz/s3"
 
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 )
 
 
=== modified file 'provider/joyent/environ_instance.go'
--- provider/joyent/environ_instance.go	2014-05-14 02:59:53 +0000
+++ provider/joyent/environ_instance.go	2014-05-15 02:28:23 +0000
@@ -11,6 +11,7 @@
 
 	"github.com/joyent/gocommon/client"
 	"github.com/joyent/gosdc/cloudapi"
+	"github.com/juju/errors"
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
@@ -18,7 +19,6 @@
 	"launchpad.net/juju-core/environs/instances"
 	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/arch"
 	"launchpad.net/juju-core/names"
 
=== modified file 'provider/joyent/storage.go'
--- provider/joyent/storage.go	2014-04-30 23:18:40 +0000
+++ provider/joyent/storage.go	2014-05-15 02:28:23 +0000
@@ -13,8 +13,8 @@
 	"sync"
 	"time"
 
+	"github.com/juju/errors"
 	"launchpad.net/juju-core/environs/storage"
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 
 	"github.com/joyent/gocommon/client"
@@ -94,7 +94,7 @@
 		s.madeContainer = false
 	}
 	if je.IsResourceNotFound(err) {
-		return coreerrors.NewNotFound(err, fmt.Sprintf("cannot delete %s, not found", containerName))
+		return errors.NewNotFound(err, fmt.Sprintf("cannot delete %s, not found", containerName))
 	}
 	return err
 }
@@ -155,7 +155,7 @@
 func (s *JoyentStorage) Get(name string) (io.ReadCloser, error) {
 	b, err := s.manta.GetObject(s.containerName, name)
 	if err != nil {
-		return nil, coreerrors.NewNotFound(err, fmt.Sprintf("cannot find %s", name))
+		return nil, errors.NewNotFound(err, fmt.Sprintf("cannot find %s", name))
 	}
 	r := byteCloser{bytes.NewReader(b)}
 	return r, nil
 
=== modified file 'provider/joyent/storage_test.go'
--- provider/joyent/storage_test.go	2014-04-14 12:36:13 +0000
+++ provider/joyent/storage_test.go	2014-05-15 02:28:23 +0000
@@ -12,10 +12,10 @@
 	"strings"
 
 	"github.com/joyent/gocommon/errors"
+	jujuerrors "github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/provider/joyent"
 	jp "launchpad.net/juju-core/provider/joyent"
 )
@@ -117,7 +117,7 @@
 
 	_, err := mantaStorage.Get("noFile")
 	c.Assert(err, gc.NotNil)
-	c.Assert(err, jc.Satisfies, coreerrors.IsNotFound)
+	c.Assert(err, jc.Satisfies, jujuerrors.IsNotFound)
 }
 
 func (s *storageSuite) TestPut(c *gc.C) {
@@ -195,5 +195,5 @@
 
 	err := mantaStorage.DeleteContainer("noContainer")
 	c.Assert(err, gc.NotNil)
-	c.Assert(err, jc.Satisfies, coreerrors.IsNotFound)
+	c.Assert(err, jc.Satisfies, jujuerrors.IsNotFound)
 }
 
=== modified file 'provider/local/environ.go'
--- provider/local/environ.go	2014-05-14 02:59:53 +0000
+++ provider/local/environ.go	2014-05-15 02:28:23 +0000
@@ -15,7 +15,7 @@
 	"sync"
 	"syscall"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/agent/mongo"
@@ -34,7 +34,6 @@
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/arch"
 	"launchpad.net/juju-core/juju/osenv"
@@ -476,7 +475,7 @@
 			// Exit status 1 means no processes were matched:
 			// we don't consider this an error here.
 			if err.ProcessState.Sys().(syscall.WaitStatus).ExitStatus() != 1 {
-				return errgo.Annotate(err, "failed to kill jujud")
+				return errors.Annotate(err, "failed to kill jujud")
 			}
 		}
 	}
 
=== modified file 'provider/local/instance.go'
--- provider/local/instance.go	2014-04-14 12:36:13 +0000
+++ provider/local/instance.go	2014-05-15 02:28:23 +0000
@@ -6,7 +6,8 @@
 import (
 	"fmt"
 
-	"launchpad.net/juju-core/errors"
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/provider/common"
 )
 
=== modified file 'provider/maas/environ.go'
--- provider/maas/environ.go	2014-05-14 02:59:53 +0000
+++ provider/maas/environ.go	2014-05-15 02:28:23 +0000
@@ -13,6 +13,7 @@
 	"sync"
 	"time"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo/bson"
 	"launchpad.net/gomaasapi"
 
@@ -26,7 +27,6 @@
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/provider/common"
 	"launchpad.net/juju-core/state"
 
=== modified file 'provider/maas/environ_whitebox_test.go'
--- provider/maas/environ_whitebox_test.go	2014-05-14 02:59:53 +0000
+++ provider/maas/environ_whitebox_test.go	2014-05-15 02:28:23 +0000
@@ -12,6 +12,7 @@
 	"strings"
 	"text/template"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 	"launchpad.net/gomaasapi"
@@ -27,7 +28,6 @@
 	"launchpad.net/juju-core/environs/storage"
 	envtesting "launchpad.net/juju-core/environs/testing"
 	envtools "launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	coretesting "launchpad.net/juju-core/testing"
 
=== modified file 'provider/maas/storage.go'
--- provider/maas/storage.go	2014-04-30 23:18:40 +0000
+++ provider/maas/storage.go	2014-05-15 02:28:23 +0000
@@ -14,10 +14,10 @@
 	"strings"
 	"sync"
 
+	"github.com/juju/errors"
 	"launchpad.net/gomaasapi"
 
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 )
 
 
=== modified file 'provider/maas/storage_test.go'
--- provider/maas/storage_test.go	2014-04-14 12:36:13 +0000
+++ provider/maas/storage_test.go	2014-05-15 02:28:23 +0000
@@ -12,12 +12,12 @@
 	"net/url"
 	"sync"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 	"launchpad.net/gomaasapi"
 
 	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/errors"
 )
 
 type storageSuite struct {
 
=== modified file 'provider/manual/environ.go'
--- provider/manual/environ.go	2014-05-14 02:59:53 +0000
+++ provider/manual/environ.go	2014-05-15 02:28:23 +0000
@@ -5,13 +5,13 @@
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"net"
 	"path"
 	"strings"
 	"sync"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/agent"
@@ -26,7 +26,6 @@
 	"launchpad.net/juju-core/environs/sshstorage"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/arch"
 	"launchpad.net/juju-core/provider/common"
@@ -205,7 +204,7 @@
 // given instance on the given network. This is not supported on the
 // manual provider.
 func (*manualEnviron) AllocateAddress(_ instance.Id, _ network.Id) (instance.Address, error) {
-	return instance.Address{}, coreerrors.NotSupportedf("AllocateAddress")
+	return instance.Address{}, errors.NotSupportedf("AllocateAddress")
 }
 
 var newSSHStorage = func(sshHost, storageDir, storageTmpdir string) (storage.Storage, error) {
 
=== modified file 'provider/openstack/provider.go'
--- provider/openstack/provider.go	2014-05-14 02:59:53 +0000
+++ provider/openstack/provider.go	2014-05-15 02:28:23 +0000
@@ -14,6 +14,7 @@
 	"sync"
 	"time"
 
+	jujuerrors "github.com/juju/errors"
 	"github.com/juju/loggo"
 	"launchpad.net/goose/client"
 	gooseerrors "launchpad.net/goose/errors"
@@ -30,7 +31,6 @@
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/arch"
 	"launchpad.net/juju-core/names"
@@ -1005,7 +1005,7 @@
 // given instance on the given network. This is not implemented on the
 // OpenStack provider yet.
 func (*environ) AllocateAddress(_ instance.Id, _ network.Id) (instance.Address, error) {
-	return instance.Address{}, coreerrors.NotImplementedf("AllocateAddress")
+	return instance.Address{}, jujuerrors.NotImplementedf("AllocateAddress")
 }
 
 func (e *environ) AllInstances() (insts []instance.Instance, err error) {
 
=== modified file 'provider/openstack/storage.go'
--- provider/openstack/storage.go	2014-04-30 23:18:40 +0000
+++ provider/openstack/storage.go	2014-05-15 02:28:23 +0000
@@ -9,11 +9,11 @@
 	"sync"
 	"time"
 
+	jujuerrors "github.com/juju/errors"
 	gooseerrors "launchpad.net/goose/errors"
 	"launchpad.net/goose/swift"
 
 	"launchpad.net/juju-core/environs/storage"
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 )
 
@@ -178,7 +178,7 @@
 // container not being found.
 func maybeNotFound(err error) (error, bool) {
 	if err != nil && gooseerrors.IsNotFound(err) {
-		return coreerrors.NewNotFound(err, ""), true
+		return jujuerrors.NewNotFound(err, ""), true
 	}
 	return err, false
 }
 
=== modified file 'state/addmachine.go'
--- state/addmachine.go	2014-04-30 23:18:40 +0000
+++ state/addmachine.go	2014-05-15 02:28:23 +0000
@@ -7,11 +7,11 @@
 	"fmt"
 	"strconv"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
 
 	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/replicaset"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'state/annotator.go'
--- state/annotator.go	2014-04-17 12:47:50 +0000
+++ state/annotator.go	2014-05-15 02:28:23 +0000
@@ -7,11 +7,10 @@
 	"fmt"
 	"strings"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
-
-	"launchpad.net/juju-core/errors"
 )
 
 // annotatorDoc represents the internal state of annotations for an Entity in
 
=== modified file 'state/api/agent/machine_test.go'
--- state/api/agent/machine_test.go	2014-04-14 12:36:13 +0000
+++ state/api/agent/machine_test.go	2014-05-15 02:28:23 +0000
@@ -7,13 +7,13 @@
 	"fmt"
 	stdtesting "testing"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	"labix.org/v2/mgo"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/agent/mongo"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 
=== modified file 'state/api/client.go'
--- state/api/client.go	2014-05-01 16:57:34 +0000
+++ state/api/client.go	2014-05-15 02:28:23 +0000
@@ -16,12 +16,12 @@
 	"time"
 
 	"code.google.com/p/go.net/websocket"
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/network"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/tools"
 
=== modified file 'state/api/machiner/machiner_test.go'
--- state/api/machiner/machiner_test.go	2014-04-14 12:36:13 +0000
+++ state/api/machiner/machiner_test.go	2014-05-15 02:28:23 +0000
@@ -6,10 +6,10 @@
 import (
 	stdtesting "testing"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 
=== modified file 'state/api/provisioner/provisioner_test.go'
--- state/api/provisioner/provisioner_test.go	2014-05-09 13:24:50 +0000
+++ state/api/provisioner/provisioner_test.go	2014-05-15 02:28:23 +0000
@@ -6,12 +6,12 @@
 import (
 	stdtesting "testing"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/container"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/names"
 
=== modified file 'state/api/uniter/unit_test.go'
--- state/api/uniter/unit_test.go	2014-04-14 12:36:13 +0000
+++ state/api/uniter/unit_test.go	2014-05-15 02:28:23 +0000
@@ -6,11 +6,11 @@
 import (
 	"sort"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'state/api/upgrader/unitupgrader_test.go'
--- state/api/upgrader/unitupgrader_test.go	2014-04-14 12:36:13 +0000
+++ state/api/upgrader/unitupgrader_test.go	2014-05-15 02:28:23 +0000
@@ -4,10 +4,10 @@
 package upgrader_test
 
 import (
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/errors"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 
=== modified file 'state/api/upgrader/upgrader_test.go'
--- state/api/upgrader/upgrader_test.go	2014-04-14 12:36:13 +0000
+++ state/api/upgrader/upgrader_test.go	2014-05-15 02:28:23 +0000
@@ -6,11 +6,11 @@
 import (
 	stdtesting "testing"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 
=== modified file 'state/apiserver/admin.go'
--- state/apiserver/admin.go	2014-04-30 21:51:15 +0000
+++ state/apiserver/admin.go	2014-05-15 02:28:23 +0000
@@ -7,7 +7,8 @@
 	stderrors "errors"
 	"sync"
 
-	"launchpad.net/juju-core/errors"
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/rpc"
 	"launchpad.net/juju-core/state"
 
=== modified file 'state/apiserver/charmrevisionupdater/updater.go'
--- state/apiserver/charmrevisionupdater/updater.go	2014-04-30 23:18:40 +0000
+++ state/apiserver/charmrevisionupdater/updater.go	2014-05-15 02:28:23 +0000
@@ -4,10 +4,10 @@
 package charmrevisionupdater
 
 import (
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/apiserver/common"
 
=== modified file 'state/apiserver/charmrevisionupdater/updater_test.go'
--- state/apiserver/charmrevisionupdater/updater_test.go	2014-04-17 12:53:23 +0000
+++ state/apiserver/charmrevisionupdater/updater_test.go	2014-05-15 02:28:23 +0000
@@ -4,11 +4,11 @@
 package charmrevisionupdater_test
 
 import (
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/apiserver/charmrevisionupdater"
 
=== modified file 'state/apiserver/charms.go'
--- state/apiserver/charms.go	2014-04-07 05:11:48 +0000
+++ state/apiserver/charms.go	2014-05-15 02:28:23 +0000
@@ -21,7 +21,7 @@
 	"strconv"
 	"strings"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/environs"
@@ -236,13 +236,13 @@
 	}
 	zipr, err := zip.NewReader(f, fi.Size())
 	if err != nil {
-		return errgo.Annotate(err, "cannot open charm archive")
+		return errors.Annotate(err, "cannot open charm archive")
 	}
 
 	// Find out the root dir prefix from the archive.
 	rootDir, err := h.findArchiveRootDir(zipr)
 	if err != nil {
-		return errgo.Annotate(err, "cannot read charm archive")
+		return errors.Annotate(err, "cannot read charm archive")
 	}
 	if rootDir == "." {
 		// Normal charm, just use charm.ReadBundle().
@@ -253,15 +253,15 @@
 	// dir and then read it as a charm dir.
 	tempDir, err := ioutil.TempDir("", "charm-extract")
 	if err != nil {
-		return errgo.Annotate(err, "cannot create temp directory")
+		return errors.Annotate(err, "cannot create temp directory")
 	}
 	defer os.RemoveAll(tempDir)
 	if err := ziputil.Extract(zipr, tempDir, rootDir); err != nil {
-		return errgo.Annotate(err, "cannot extract charm archive")
+		return errors.Annotate(err, "cannot extract charm archive")
 	}
 	dir, err := charm.ReadDir(tempDir)
 	if err != nil {
-		return errgo.Annotate(err, "cannot read extracted archive")
+		return errors.Annotate(err, "cannot read extracted archive")
 	}
 
 	// Now repackage the dir as a bundle at the original path.
@@ -313,25 +313,25 @@
 	// dir and the repackaged archive.
 	tempDir, err := ioutil.TempDir("", "charm-download")
 	if err != nil {
-		return errgo.Annotate(err, "cannot create temp directory")
+		return errors.Annotate(err, "cannot create temp directory")
 	}
 	defer os.RemoveAll(tempDir)
 	extractPath := filepath.Join(tempDir, "extracted")
 	repackagedPath := filepath.Join(tempDir, "repackaged.zip")
 	repackagedArchive, err := os.Create(repackagedPath)
 	if err != nil {
-		return errgo.Annotate(err, "cannot repackage uploaded charm")
+		return errors.Annotate(err, "cannot repackage uploaded charm")
 	}
 	defer repackagedArchive.Close()
 
 	// Expand and repack it with the revision specified by curl.
 	archive.SetRevision(curl.Revision)
 	if err := archive.ExpandTo(extractPath); err != nil {
-		return errgo.Annotate(err, "cannot extract uploaded charm")
+		return errors.Annotate(err, "cannot extract uploaded charm")
 	}
 	charmDir, err := charm.ReadDir(extractPath)
 	if err != nil {
-		return errgo.Annotate(err, "cannot read extracted charm")
+		return errors.Annotate(err, "cannot read extracted charm")
 	}
 
 	// Bundle the charm and calculate its sha256 hash at the
@@ -339,39 +339,39 @@
 	hash := sha256.New()
 	err = charmDir.BundleTo(io.MultiWriter(hash, repackagedArchive))
 	if err != nil {
-		return errgo.Annotate(err, "cannot repackage uploaded charm")
+		return errors.Annotate(err, "cannot repackage uploaded charm")
 	}
 	bundleSHA256 := hex.EncodeToString(hash.Sum(nil))
 	size, err := repackagedArchive.Seek(0, 2)
 	if err != nil {
-		return errgo.Annotate(err, "cannot get charm file size")
+		return errors.Annotate(err, "cannot get charm file size")
 	}
 
 	// Now upload to provider storage.
 	if _, err := repackagedArchive.Seek(0, 0); err != nil {
-		return errgo.Annotate(err, "cannot rewind the charm file reader")
+		return errors.Annotate(err, "cannot rewind the charm file reader")
 	}
 	storage, err := environs.GetStorage(h.state)
 	if err != nil {
-		return errgo.Annotate(err, "cannot access provider storage")
+		return errors.Annotate(err, "cannot access provider storage")
 	}
 	name := charm.Quote(curl.String())
 	if err := storage.Put(name, repackagedArchive, size); err != nil {
-		return errgo.Annotate(err, "cannot upload charm to provider storage")
+		return errors.Annotate(err, "cannot upload charm to provider storage")
 	}
 	storageURL, err := storage.URL(name)
 	if err != nil {
-		return errgo.Annotate(err, "cannot get storage URL for charm")
+		return errors.Annotate(err, "cannot get storage URL for charm")
 	}
 	bundleURL, err := url.Parse(storageURL)
 	if err != nil {
-		return errgo.Annotate(err, "cannot parse storage URL")
+		return errors.Annotate(err, "cannot parse storage URL")
 	}
 
 	// And finally, update state.
 	_, err = h.state.UpdateUploadedCharm(archive, curl, bundleURL, bundleSHA256)
 	if err != nil {
-		return errgo.Annotate(err, "cannot update uploaded charm in state")
+		return errors.Annotate(err, "cannot update uploaded charm in state")
 	}
 	return nil
 }
@@ -416,18 +416,18 @@
 	// Get the provider storage.
 	storage, err := environs.GetStorage(h.state)
 	if err != nil {
-		return errgo.Annotate(err, "cannot access provider storage")
+		return errors.Annotate(err, "cannot access provider storage")
 	}
 
 	// Use the storage to retrieve and save the charm archive.
 	reader, err := storage.Get(name)
 	if err != nil {
-		return errgo.Annotate(err, "charm not found in the provider storage")
+		return errors.Annotate(err, "charm not found in the provider storage")
 	}
 	defer reader.Close()
 	data, err := ioutil.ReadAll(reader)
 	if err != nil {
-		return errgo.Annotate(err, "cannot read charm data")
+		return errors.Annotate(err, "cannot read charm data")
 	}
 	// In order to avoid races, the archive is saved in a temporary file which
 	// is then atomically renamed. The temporary file is created in the
@@ -435,19 +435,19 @@
 	// target live in the same file system.
 	cacheDir := filepath.Dir(charmArchivePath)
 	if err = os.MkdirAll(cacheDir, 0755); err != nil {
-		return errgo.Annotate(err, "cannot create the charms cache")
+		return errors.Annotate(err, "cannot create the charms cache")
 	}
 	tempCharmArchive, err := ioutil.TempFile(cacheDir, "charm")
 	if err != nil {
-		return errgo.Annotate(err, "cannot create charm archive temp file")
+		return errors.Annotate(err, "cannot create charm archive temp file")
 	}
 	defer tempCharmArchive.Close()
 	if err = ioutil.WriteFile(tempCharmArchive.Name(), data, 0644); err != nil {
-		return errgo.Annotate(err, "error processing charm archive download")
+		return errors.Annotate(err, "error processing charm archive download")
 	}
 	if err = os.Rename(tempCharmArchive.Name(), charmArchivePath); err != nil {
 		defer os.Remove(tempCharmArchive.Name())
-		return errgo.Annotate(err, "error renaming the charm archive")
+		return errors.Annotate(err, "error renaming the charm archive")
 	}
 	return nil
 }
 
=== modified file 'state/apiserver/client/api_test.go'
--- state/apiserver/client/api_test.go	2014-05-01 16:14:47 +0000
+++ state/apiserver/client/api_test.go	2014-05-15 02:28:23 +0000
@@ -8,13 +8,13 @@
 	stdtesting "testing"
 	"time"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 
=== modified file 'state/apiserver/client/client.go'
--- state/apiserver/client/client.go	2014-04-30 23:18:40 +0000
+++ state/apiserver/client/client.go	2014-05-15 02:28:23 +0000
@@ -9,7 +9,7 @@
 	"os"
 	"strings"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/charm"
@@ -17,7 +17,6 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/manual"
 	envtools "launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
@@ -953,47 +952,47 @@
 	store := config.SpecializeCharmRepo(CharmStore, envConfig)
 	downloadedCharm, err := store.Get(charmURL)
 	if err != nil {
-		return errgo.Annotatef(err, "cannot download charm %q", charmURL.String())
+		return errors.Annotatef(err, "cannot download charm %q", charmURL.String())
 	}
 
 	// Open it and calculate the SHA256 hash.
 	downloadedBundle, ok := downloadedCharm.(*charm.Bundle)
 	if !ok {
-		return errgo.New("expected a charm archive, got %T", downloadedCharm)
+		return errors.Errorf("expected a charm archive, got %T", downloadedCharm)
 	}
 	archive, err := os.Open(downloadedBundle.Path)
 	if err != nil {
-		return errgo.Annotate(err, "cannot read downloaded charm")
+		return errors.Annotate(err, "cannot read downloaded charm")
 	}
 	defer archive.Close()
 	bundleSHA256, size, err := utils.ReadSHA256(archive)
 	if err != nil {
-		return errgo.Annotate(err, "cannot calculate SHA256 hash of charm")
+		return errors.Annotate(err, "cannot calculate SHA256 hash of charm")
 	}
 	if _, err := archive.Seek(0, 0); err != nil {
-		return errgo.Annotate(err, "cannot rewind charm archive")
+		return errors.Annotate(err, "cannot rewind charm archive")
 	}
 
 	// Get the environment storage and upload the charm.
 	env, err := environs.New(envConfig)
 	if err != nil {
-		return errgo.Annotate(err, "cannot access environment")
+		return errors.Annotate(err, "cannot access environment")
 	}
 	storage := env.Storage()
 	archiveName, err := CharmArchiveName(charmURL.Name, charmURL.Revision)
 	if err != nil {
-		return errgo.Annotate(err, "cannot generate charm archive name")
+		return errors.Annotate(err, "cannot generate charm archive name")
 	}
 	if err := storage.Put(archiveName, archive, size); err != nil {
-		return errgo.Annotate(err, "cannot upload charm to provider storage")
+		return errors.Annotate(err, "cannot upload charm to provider storage")
 	}
 	storageURL, err := storage.URL(archiveName)
 	if err != nil {
-		return errgo.Annotate(err, "cannot get storage URL for charm")
+		return errors.Annotate(err, "cannot get storage URL for charm")
 	}
 	bundleURL, err := url.Parse(storageURL)
 	if err != nil {
-		return errgo.Annotate(err, "cannot parse storage URL")
+		return errors.Annotate(err, "cannot parse storage URL")
 	}
 
 	// Finally, update the charm data in state and mark it as no longer pending.
@@ -1005,7 +1004,7 @@
 		// us. This means we have to delete what we just uploaded
 		// to storage.
 		if err := storage.Remove(archiveName); err != nil {
-			errgo.Annotate(err, "cannot remove duplicated charm from storage")
+			errors.Annotate(err, "cannot remove duplicated charm from storage")
 		}
 		return nil
 	}
 
=== modified file 'state/apiserver/client/client_test.go'
--- state/apiserver/client/client_test.go	2014-04-23 11:57:06 +0000
+++ state/apiserver/client/client_test.go	2014-05-15 02:28:23 +0000
@@ -11,6 +11,7 @@
 	"sync"
 	"time"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
@@ -21,7 +22,6 @@
 	"launchpad.net/juju-core/environs/manual"
 	envstorage "launchpad.net/juju-core/environs/storage"
 	ttesting "launchpad.net/juju-core/environs/tools/testing"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/state"
 
=== modified file 'state/apiserver/client/destroy_test.go'
--- state/apiserver/client/destroy_test.go	2014-04-14 12:36:13 +0000
+++ state/apiserver/client/destroy_test.go	2014-05-15 02:28:23 +0000
@@ -6,11 +6,11 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs"
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
@@ -109,7 +109,7 @@
 	for _, s := range services {
 		err = s.Refresh()
 		if err != nil {
-			c.Assert(err, jc.Satisfies, coreerrors.IsNotFound)
+			c.Assert(err, jc.Satisfies, errors.IsNotFound)
 		} else {
 			c.Assert(s.Life(), gc.Not(gc.Equals), state.Alive)
 		}
 
=== modified file 'state/apiserver/client/status.go'
--- state/apiserver/client/status.go	2014-05-01 17:56:04 +0000
+++ state/apiserver/client/status.go	2014-05-15 02:28:23 +0000
@@ -9,8 +9,9 @@
 	"regexp"
 	"strings"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/state"
 
=== modified file 'state/apiserver/common/errors.go'
--- state/apiserver/common/errors.go	2014-04-14 12:36:13 +0000
+++ state/apiserver/common/errors.go	2014-05-15 02:28:23 +0000
@@ -7,7 +7,8 @@
 	stderrors "errors"
 	"fmt"
 
-	"launchpad.net/juju-core/errors"
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 )
 
=== modified file 'state/apiserver/common/errors_test.go'
--- state/apiserver/common/errors_test.go	2014-04-14 12:36:13 +0000
+++ state/apiserver/common/errors_test.go	2014-05-15 02:28:23 +0000
@@ -6,10 +6,10 @@
 import (
 	stderrors "errors"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/apiserver/common"
 
=== modified file 'state/apiserver/common/password_test.go'
--- state/apiserver/common/password_test.go	2014-03-13 13:42:50 +0000
+++ state/apiserver/common/password_test.go	2014-05-15 02:28:23 +0000
@@ -6,10 +6,10 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/apiserver/common"
 
=== modified file 'state/apiserver/deployer/deployer_test.go'
--- state/apiserver/deployer/deployer_test.go	2014-04-17 12:53:23 +0000
+++ state/apiserver/deployer/deployer_test.go	2014-05-15 02:28:23 +0000
@@ -7,10 +7,10 @@
 	"sort"
 	stdtesting "testing"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/names"
 
=== modified file 'state/apiserver/firewaller/firewaller_test.go'
--- state/apiserver/firewaller/firewaller_test.go	2014-04-14 12:36:13 +0000
+++ state/apiserver/firewaller/firewaller_test.go	2014-05-15 02:28:23 +0000
@@ -6,10 +6,10 @@
 import (
 	stdtesting "testing"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 
=== modified file 'state/apiserver/keymanager/keymanager.go'
--- state/apiserver/keymanager/keymanager.go	2014-04-30 23:18:40 +0000
+++ state/apiserver/keymanager/keymanager.go	2014-05-15 02:28:23 +0000
@@ -8,10 +8,10 @@
 	"fmt"
 	"strings"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'state/apiserver/keyupdater/authorisedkeys.go'
--- state/apiserver/keyupdater/authorisedkeys.go	2014-04-14 12:36:13 +0000
+++ state/apiserver/keyupdater/authorisedkeys.go	2014-05-15 02:28:23 +0000
@@ -4,7 +4,8 @@
 package keyupdater
 
 import (
-	"launchpad.net/juju-core/errors"
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/apiserver/common"
 
=== modified file 'state/apiserver/machine/machiner.go'
--- state/apiserver/machine/machiner.go	2014-04-14 12:36:13 +0000
+++ state/apiserver/machine/machiner.go	2014-05-15 02:28:23 +0000
@@ -6,7 +6,8 @@
 package machine
 
 import (
-	"launchpad.net/juju-core/errors"
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/apiserver/common"
 
=== modified file 'state/apiserver/provisioner/provisioner_test.go'
--- state/apiserver/provisioner/provisioner_test.go	2014-05-09 13:24:50 +0000
+++ state/apiserver/provisioner/provisioner_test.go	2014-05-15 02:28:23 +0000
@@ -7,12 +7,12 @@
 	"fmt"
 	stdtesting "testing"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/container"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/juju/testing"
 
=== modified file 'state/apiserver/uniter/uniter.go'
--- state/apiserver/uniter/uniter.go	2014-04-14 12:36:13 +0000
+++ state/apiserver/uniter/uniter.go	2014-05-15 02:28:23 +0000
@@ -8,8 +8,9 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'state/apiserver/uniter/uniter_test.go'
--- state/apiserver/uniter/uniter_test.go	2014-04-17 12:53:23 +0000
+++ state/apiserver/uniter/uniter_test.go	2014-05-15 02:28:23 +0000
@@ -6,12 +6,12 @@
 import (
 	stdtesting "testing"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/charm"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 
=== modified file 'state/apiserver/upgrader/unitupgrader_test.go'
--- state/apiserver/upgrader/unitupgrader_test.go	2014-04-14 12:36:13 +0000
+++ state/apiserver/upgrader/unitupgrader_test.go	2014-05-15 02:28:23 +0000
@@ -4,10 +4,10 @@
 package upgrader_test
 
 import (
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/errors"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'state/apiserver/upgrader/upgrader_test.go'
--- state/apiserver/upgrader/upgrader_test.go	2014-04-14 12:36:13 +0000
+++ state/apiserver/upgrader/upgrader_test.go	2014-05-15 02:28:23 +0000
@@ -4,11 +4,11 @@
 package upgrader_test
 
 import (
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/errors"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'state/charm_test.go'
--- state/charm_test.go	2014-04-14 12:36:13 +0000
+++ state/charm_test.go	2014-05-15 02:28:23 +0000
@@ -7,11 +7,11 @@
 	"bytes"
 	"net/url"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/testing"
 )
 
=== modified file 'state/cleanup.go'
--- state/cleanup.go	2014-04-14 12:36:13 +0000
+++ state/cleanup.go	2014-05-15 02:28:23 +0000
@@ -3,10 +3,9 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
-
-	"launchpad.net/juju-core/errors"
 )
 
 // cleanupDoc represents a potentially large set of documents that should be
 
=== modified file 'state/cleanup_test.go'
--- state/cleanup_test.go	2014-04-14 12:36:13 +0000
+++ state/cleanup_test.go	2014-05-15 02:28:23 +0000
@@ -3,11 +3,11 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 )
 
=== modified file 'state/configvalidator_test.go'
--- state/configvalidator_test.go	2014-04-14 12:36:13 +0000
+++ state/configvalidator_test.go	2014-05-15 02:28:23 +0000
@@ -4,9 +4,10 @@
 package state_test
 
 import (
+	"github.com/juju/errors"
 	gc "launchpad.net/gocheck"
+
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	coretesting "launchpad.net/juju-core/testing"
 )
 
=== modified file 'state/conn_test.go'
--- state/conn_test.go	2014-04-22 09:23:39 +0000
+++ state/conn_test.go	2014-05-15 02:28:23 +0000
@@ -6,12 +6,12 @@
 import (
 	stdtesting "testing"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/testing/testbase"
 
=== modified file 'state/constraints.go'
--- state/constraints.go	2014-04-17 03:10:18 +0000
+++ state/constraints.go	2014-05-15 02:28:23 +0000
@@ -6,12 +6,12 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
 
 	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 )
 
 
=== modified file 'state/environ.go'
--- state/environ.go	2014-04-01 00:58:29 +0000
+++ state/environ.go	2014-05-15 02:28:23 +0000
@@ -4,11 +4,11 @@
 package state
 
 import (
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/names"
 )
 
 
=== modified file 'state/environcapability_test.go'
--- state/environcapability_test.go	2014-04-14 12:36:13 +0000
+++ state/environcapability_test.go	2014-05-15 02:28:23 +0000
@@ -6,10 +6,10 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 )
 
=== modified file 'state/machine.go'
--- state/machine.go	2014-04-22 09:23:39 +0000
+++ state/machine.go	2014-05-15 02:28:23 +0000
@@ -9,12 +9,12 @@
 	"strings"
 	"time"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
 
 	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'state/machine_test.go'
--- state/machine_test.go	2014-04-21 23:10:05 +0000
+++ state/machine_test.go	2014-05-15 02:28:23 +0000
@@ -7,6 +7,7 @@
 	"sort"
 	"strings"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	jc "github.com/juju/testing/checkers"
 	"labix.org/v2/mgo/bson"
@@ -15,7 +16,6 @@
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/network"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'state/megawatcher.go'
--- state/megawatcher.go	2014-04-14 12:36:13 +0000
+++ state/megawatcher.go	2014-05-15 02:28:23 +0000
@@ -8,9 +8,9 @@
 	"reflect"
 	"strings"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/multiwatcher"
 	"launchpad.net/juju-core/state/watcher"
 
=== modified file 'state/minimumunits.go'
--- state/minimumunits.go	2014-04-17 12:47:50 +0000
+++ state/minimumunits.go	2014-05-15 02:28:23 +0000
@@ -4,12 +4,9 @@
 package state
 
 import (
-	"errors"
-
+	"github.com/juju/errors"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
-
-	coreerrors "launchpad.net/juju-core/errors"
 )
 
 // minUnitsDoc keeps track of relevant changes on the service's MinUnits field
@@ -31,7 +28,7 @@
 
 // SetMinUnits changes the number of minimum units required by the service.
 func (s *Service) SetMinUnits(minUnits int) (err error) {
-	defer coreerrors.Maskf(&err, "cannot set minimum units for service %q", s)
+	defer errors.Maskf(&err, "cannot set minimum units for service %q", s)
 	defer func() {
 		if err == nil {
 			s.doc.MinUnits = minUnits
@@ -127,7 +124,7 @@
 // EnsureMinUnits adds new units if the service's MinUnits value is greater
 // than the number of alive units.
 func (s *Service) EnsureMinUnits() (err error) {
-	defer coreerrors.Maskf(&err, "cannot ensure minimum units for service %q", s)
+	defer errors.Maskf(&err, "cannot ensure minimum units for service %q", s)
 	service := &Service{st: s.st, doc: s.doc}
 	for {
 		// Ensure the service is alive.
 
=== modified file 'state/open.go'
--- state/open.go	2014-05-07 08:10:22 +0000
+++ state/open.go	2014-05-15 02:28:23 +0000
@@ -11,6 +11,7 @@
 	"net"
 	"time"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
@@ -18,7 +19,6 @@
 	"launchpad.net/juju-core/cert"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/presence"
 	"launchpad.net/juju-core/state/watcher"
 
=== modified file 'state/policy.go'
--- state/policy.go	2014-04-22 09:23:39 +0000
+++ state/policy.go	2014-05-15 02:28:23 +0000
@@ -6,9 +6,10 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 )
 
 // Policy is an interface provided to State that may
 
=== modified file 'state/prechecker_test.go'
--- state/prechecker_test.go	2014-04-22 09:23:39 +0000
+++ state/prechecker_test.go	2014-05-15 02:28:23 +0000
@@ -6,11 +6,11 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 )
 
=== modified file 'state/relation.go'
--- state/relation.go	2014-04-17 12:47:50 +0000
+++ state/relation.go	2014-05-15 02:28:23 +0000
@@ -10,12 +10,12 @@
 	"strconv"
 	"strings"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
 
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/names"
 )
 
 
=== modified file 'state/relation_test.go'
--- state/relation_test.go	2014-04-14 12:36:13 +0000
+++ state/relation_test.go	2014-05-15 02:28:23 +0000
@@ -4,11 +4,11 @@
 package state_test
 
 import (
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 )
 
 
=== modified file 'state/relationunit.go'
--- state/relationunit.go	2014-04-17 12:47:50 +0000
+++ state/relationunit.go	2014-05-15 02:28:23 +0000
@@ -8,12 +8,12 @@
 	"fmt"
 	"strings"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
 
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/names"
 )
 
 
=== modified file 'state/relationunit_test.go'
--- state/relationunit_test.go	2014-04-14 12:36:13 +0000
+++ state/relationunit_test.go	2014-05-15 02:28:23 +0000
@@ -9,11 +9,11 @@
 	"strconv"
 	"time"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/testing"
 
=== modified file 'state/service.go'
--- state/service.go	2014-04-25 12:19:25 +0000
+++ state/service.go	2014-05-15 02:28:23 +0000
@@ -10,13 +10,13 @@
 	"strconv"
 	"strings"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state/api/params"
 )
 
=== modified file 'state/service_test.go'
--- state/service_test.go	2014-04-21 23:10:05 +0000
+++ state/service_test.go	2014-05-15 02:28:23 +0000
@@ -7,6 +7,7 @@
 	"fmt"
 	"sort"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	jc "github.com/juju/testing/checkers"
 	"labix.org/v2/mgo"
@@ -15,7 +16,6 @@
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/testing"
 )
 
=== modified file 'state/settings.go'
--- state/settings.go	2014-03-20 01:23:05 +0000
+++ state/settings.go	2014-05-15 02:28:23 +0000
@@ -8,11 +8,10 @@
 	"sort"
 	"strings"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
-
-	"launchpad.net/juju-core/errors"
 )
 
 // See: http://docs.mongodb.org/manual/faq/developers/#faq-dollar-sign-escaping
 
=== modified file 'state/settings_test.go'
--- state/settings_test.go	2014-04-14 12:36:13 +0000
+++ state/settings_test.go	2014-05-15 02:28:23 +0000
@@ -4,11 +4,11 @@
 package state
 
 import (
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	"labix.org/v2/mgo/txn"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/testing/testbase"
 )
 
=== modified file 'state/state.go'
--- state/state.go	2014-05-01 16:57:34 +0000
+++ state/state.go	2014-05-15 02:28:23 +0000
@@ -16,6 +16,7 @@
 	"strings"
 	"sync"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
@@ -24,7 +25,6 @@
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/multiwatcher"
 
=== modified file 'state/state_test.go'
--- state/state_test.go	2014-05-01 16:14:47 +0000
+++ state/state_test.go	2014-05-15 02:28:23 +0000
@@ -10,6 +10,7 @@
 	"strings"
 	"time"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	jc "github.com/juju/testing/checkers"
 	"labix.org/v2/mgo"
@@ -19,7 +20,6 @@
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/replicaset"
 
=== modified file 'state/status.go'
--- state/status.go	2014-03-26 09:08:23 +0000
+++ state/status.go	2014-05-15 02:28:23 +0000
@@ -6,11 +6,11 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state/api/params"
 )
 
 
=== modified file 'state/tools_test.go'
--- state/tools_test.go	2014-04-14 12:36:13 +0000
+++ state/tools_test.go	2014-05-15 02:28:23 +0000
@@ -6,10 +6,10 @@
 import (
 	"fmt"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 
=== modified file 'state/unit.go'
--- state/unit.go	2014-04-30 23:18:40 +0000
+++ state/unit.go	2014-05-15 02:28:23 +0000
@@ -8,6 +8,7 @@
 	"fmt"
 	"time"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
@@ -15,7 +16,6 @@
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'state/unit_test.go'
--- state/unit_test.go	2014-04-14 12:36:13 +0000
+++ state/unit_test.go	2014-05-15 02:28:23 +0000
@@ -6,11 +6,11 @@
 import (
 	"strconv"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'state/user.go'
--- state/user.go	2014-03-28 12:28:30 +0000
+++ state/user.go	2014-05-15 02:28:23 +0000
@@ -4,11 +4,11 @@
 	"fmt"
 	"regexp"
 
+	"github.com/juju/errors"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/utils"
 )
 
=== modified file 'state/watcher.go'
--- state/watcher.go	2014-04-30 23:18:40 +0000
+++ state/watcher.go	2014-05-15 02:28:23 +0000
@@ -9,13 +9,13 @@
 	"strings"
 	"time"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"launchpad.net/tomb"
 
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'worker/authenticationworker/worker.go'
--- worker/authenticationworker/worker.go	2014-04-17 03:41:32 +0000
+++ worker/authenticationworker/worker.go	2014-05-15 02:28:23 +0000
@@ -6,11 +6,11 @@
 import (
 	"strings"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"launchpad.net/tomb"
 
 	"launchpad.net/juju-core/agent"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/state/api/keyupdater"
 	"launchpad.net/juju-core/state/api/watcher"
 	"launchpad.net/juju-core/utils/set"
 
=== modified file 'worker/deployer/deployer_test.go'
--- worker/deployer/deployer_test.go	2014-04-14 12:36:13 +0000
+++ worker/deployer/deployer_test.go	2014-05-15 02:28:23 +0000
@@ -9,9 +9,9 @@
 	stdtesting "testing"
 	"time"
 
+	"github.com/juju/errors"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/errors"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 
=== modified file 'worker/firewaller/firewaller.go'
--- worker/firewaller/firewaller.go	2014-04-30 23:18:40 +0000
+++ worker/firewaller/firewaller.go	2014-05-15 02:28:23 +0000
@@ -4,7 +4,7 @@
 package firewaller
 
 import (
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"launchpad.net/tomb"
 
@@ -122,7 +122,7 @@
 		case change := <-fw.portsChange:
 			change.unitd.ports = change.ports
 			if err := fw.flushUnits([]*unitData{change.unitd}); err != nil {
-				return errgo.Annotate(err, "cannot change firewall ports")
+				return errors.Annotate(err, "cannot change firewall ports")
 			}
 		case change := <-fw.exposedChange:
 			change.serviced.exposed = change.exposed
@@ -131,7 +131,7 @@
 				unitds = append(unitds, unitd)
 			}
 			if err := fw.flushUnits(unitds); err != nil {
-				return errgo.Annotate(err, "cannot change firewall ports")
+				return errors.Annotate(err, "cannot change firewall ports")
 			}
 		}
 	}
@@ -157,7 +157,7 @@
 	if params.IsCodeNotFound(err) {
 		return nil
 	} else if err != nil {
-		return errgo.Annotate(err, "cannot watch machine units")
+		return errors.Annotate(err, "cannot watch machine units")
 	}
 	unitw, err := m.WatchUnits()
 	if err != nil {
@@ -177,7 +177,7 @@
 		if err != nil {
 			stop("units watcher", unitw)
 			delete(fw.machineds, tag)
-			return errgo.Annotatef(err, "cannot respond to units changes for %q", tag)
+			return errors.Annotatef(err, "cannot respond to units changes for %q", tag)
 		}
 	}
 	go machined.watchLoop(unitw)
@@ -374,7 +374,7 @@
 		}
 	}
 	if err := fw.flushUnits(changed); err != nil {
-		return errgo.Annotate(err, "cannot change firewall ports")
+		return errors.Annotate(err, "cannot change firewall ports")
 	}
 	return nil
 }
 
=== modified file 'worker/instancepoller/aggregate.go'
--- worker/instancepoller/aggregate.go	2014-03-13 17:32:36 +0000
+++ worker/instancepoller/aggregate.go	2014-05-15 02:28:23 +0000
@@ -6,11 +6,11 @@
 import (
 	"time"
 
+	"github.com/juju/errors"
 	"github.com/juju/ratelimit"
 	"launchpad.net/tomb"
 
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 )
 
 
=== modified file 'worker/instancepoller/aggregate_test.go'
--- worker/instancepoller/aggregate_test.go	2014-04-15 18:51:24 +0000
+++ worker/instancepoller/aggregate_test.go	2014-05-15 02:28:23 +0000
@@ -9,11 +9,11 @@
 	"sync/atomic"
 	"time"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/testing/testbase"
 )
@@ -163,7 +163,8 @@
 	aggregator := newAggregator(testGetter)
 	_, err := aggregator.instanceInfo("foo")
 
-	c.Assert(err, gc.DeepEquals, errors.NotFoundf("instance foo"))
+	c.Assert(err, gc.ErrorMatches, "instance foo not found")
+	c.Assert(err, jc.Satisfies, errors.IsNotFound)
 }
 
 func (s *aggregateSuite) TestAddressesError(c *gc.C) {
 
=== modified file 'worker/instancepoller/machine_test.go'
--- worker/instancepoller/machine_test.go	2014-05-08 06:58:42 +0000
+++ worker/instancepoller/machine_test.go	2014-05-15 02:28:23 +0000
@@ -13,10 +13,10 @@
 	"sync/atomic"
 	"time"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'worker/instancepoller/updater.go'
--- worker/instancepoller/updater.go	2014-05-08 06:58:42 +0000
+++ worker/instancepoller/updater.go	2014-05-15 02:28:23 +0000
@@ -7,9 +7,9 @@
 	"fmt"
 	"time"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 
=== modified file 'worker/peergrouper/mock_test.go'
--- worker/peergrouper/mock_test.go	2014-04-17 16:13:09 +0000
+++ worker/peergrouper/mock_test.go	2014-05-15 02:28:23 +0000
@@ -12,9 +12,9 @@
 	"strconv"
 	"sync"
 
+	"github.com/juju/errors"
 	"launchpad.net/tomb"
 
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/replicaset"
 	"launchpad.net/juju-core/state"
 
=== modified file 'worker/peergrouper/worker.go'
--- worker/peergrouper/worker.go	2014-04-17 17:30:48 +0000
+++ worker/peergrouper/worker.go	2014-05-15 02:28:23 +0000
@@ -8,10 +8,10 @@
 	"sync"
 	"time"
 
+	"github.com/juju/errors"
 	"launchpad.net/tomb"
 
 	"launchpad.net/juju-core/agent/mongo"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/replicaset"
 	"launchpad.net/juju-core/state"
 
=== modified file 'worker/provisioner/kvm-broker_test.go'
--- worker/provisioner/kvm-broker_test.go	2014-05-14 02:59:53 +0000
+++ worker/provisioner/kvm-broker_test.go	2014-05-15 02:28:23 +0000
@@ -8,6 +8,7 @@
 	"path/filepath"
 	"time"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
@@ -17,7 +18,6 @@
 	"launchpad.net/juju-core/container/kvm/mock"
 	kvmtesting "launchpad.net/juju-core/container/kvm/testing"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	instancetest "launchpad.net/juju-core/instance/testing"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 
=== modified file 'worker/provisioner/lxc-broker_test.go'
--- worker/provisioner/lxc-broker_test.go	2014-05-14 02:59:53 +0000
+++ worker/provisioner/lxc-broker_test.go	2014-05-15 02:28:23 +0000
@@ -9,6 +9,7 @@
 	"path/filepath"
 	"time"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
@@ -18,7 +19,6 @@
 	"launchpad.net/juju-core/container/lxc/mock"
 	lxctesting "launchpad.net/juju-core/container/lxc/testing"
 	"launchpad.net/juju-core/environs"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	instancetest "launchpad.net/juju-core/instance/testing"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 
=== modified file 'worker/provisioner/provisioner.go'
--- worker/provisioner/provisioner.go	2014-04-14 12:36:13 +0000
+++ worker/provisioner/provisioner.go	2014-05-15 02:28:23 +0000
@@ -6,13 +6,13 @@
 import (
 	"sync"
 
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"launchpad.net/tomb"
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	apiprovisioner "launchpad.net/juju-core/state/api/provisioner"
 	apiwatcher "launchpad.net/juju-core/state/api/watcher"
 
=== modified file 'worker/provisioner/provisioner_test.go'
--- worker/provisioner/provisioner_test.go	2014-05-13 11:37:40 +0000
+++ worker/provisioner/provisioner_test.go	2014-05-15 02:28:23 +0000
@@ -8,6 +8,7 @@
 	"strings"
 	"time"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
@@ -17,7 +18,6 @@
 	"launchpad.net/juju-core/environs/network"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/names"
 
=== modified file 'worker/rsyslog/worker.go'
--- worker/rsyslog/worker.go	2014-04-24 11:55:01 +0000
+++ worker/rsyslog/worker.go	2014-05-15 02:28:23 +0000
@@ -10,7 +10,7 @@
 	"strconv"
 	"time"
 
-	"github.com/errgo/errgo"
+	"github.com/juju/errors"
 	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/agent"
@@ -122,7 +122,7 @@
 func (h *RsyslogConfigHandler) SetUp() (watcher.NotifyWatcher, error) {
 	if h.mode == RsyslogModeAccumulate {
 		if err := h.ensureCertificates(); err != nil {
-			return nil, errgo.Annotate(err, "failed to write rsyslog certificates")
+			return nil, errors.Annotate(err, "failed to write rsyslog certificates")
 		}
 	}
 	return h.st.WatchForEnvironConfigChanges()
@@ -140,7 +140,7 @@
 func (h *RsyslogConfigHandler) Handle() error {
 	cfg, err := h.st.EnvironConfig()
 	if err != nil {
-		return errgo.Annotate(err, "cannot get environ config")
+		return errors.Annotate(err, "cannot get environ config")
 	}
 	rsyslogCACert := cfg.RsyslogCACert()
 	if rsyslogCACert == "" {
@@ -154,20 +154,20 @@
 	h.syslogConfig.Port = cfg.SyslogPort()
 	if h.mode == RsyslogModeForwarding {
 		if err := writeFileAtomic(h.syslogConfig.CACertPath(), []byte(rsyslogCACert), 0644, 0, 0); err != nil {
-			return errgo.Annotate(err, "cannot write CA certificate")
+			return errors.Annotate(err, "cannot write CA certificate")
 		}
 	}
 	data, err := h.syslogConfig.Render()
 	if err != nil {
-		return errgo.Annotate(err, "failed to render rsyslog configuration file")
+		return errors.Annotate(err, "failed to render rsyslog configuration file")
 	}
 	if err := writeFileAtomic(h.syslogConfig.ConfigFilePath(), []byte(data), 0644, 0, 0); err != nil {
-		return errgo.Annotate(err, "failed to write rsyslog configuration file")
+		return errors.Annotate(err, "failed to write rsyslog configuration file")
 	}
 	logger.Debugf("Reloading rsyslog configuration")
 	if err := restartRsyslog(); err != nil {
 		logger.Errorf("failed to reload rsyslog configuration")
-		return errgo.Annotate(err, "cannot restart rsyslog")
+		return errors.Annotate(err, "cannot restart rsyslog")
 	}
 	// Record config values so we don't try again.
 	// Do this last so we recover from intermittent
 
=== modified file 'worker/uniter/charm/bundles.go'
--- worker/uniter/charm/bundles.go	2014-04-17 12:47:50 +0000
+++ worker/uniter/charm/bundles.go	2014-05-15 02:28:23 +0000
@@ -8,9 +8,10 @@
 	"os"
 	"path"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/downloader"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 )
 
 
=== modified file 'worker/uniter/relation/relation.go'
--- worker/uniter/relation/relation.go	2014-04-17 12:47:50 +0000
+++ worker/uniter/relation/relation.go	2014-05-15 02:28:23 +0000
@@ -13,8 +13,9 @@
 	"strconv"
 	"strings"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/charm/hooks"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/worker/uniter/hook"
 )
 
=== modified file 'worker/uniter/relationer_test.go'
--- worker/uniter/relationer_test.go	2014-04-14 12:36:13 +0000
+++ worker/uniter/relationer_test.go	2014-05-15 02:28:23 +0000
@@ -8,11 +8,11 @@
 	"strings"
 	"time"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/charm/hooks"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 
=== modified file 'worker/uniter/state.go'
--- worker/uniter/state.go	2014-04-17 12:47:50 +0000
+++ worker/uniter/state.go	2014-05-15 02:28:23 +0000
@@ -4,12 +4,12 @@
 package uniter
 
 import (
-	"errors"
 	"fmt"
 	"os"
 
+	"github.com/juju/errors"
+
 	"launchpad.net/juju-core/charm"
-	coreerrors "launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/utils"
 	uhook "launchpad.net/juju-core/worker/uniter/hook"
 )
@@ -75,7 +75,7 @@
 
 // validate returns an error if the state violates expectations.
 func (st State) validate() (err error) {
-	defer coreerrors.Maskf(&err, "invalid uniter state")
+	defer errors.Maskf(&err, "invalid uniter state")
 	hasHook := st.Hook != nil
 	hasCharm := st.CharmURL != nil
 	switch st.Op {
 
=== modified file 'worker/uniter/uniter_test.go'
--- worker/uniter/uniter_test.go	2014-05-13 23:18:30 +0000
+++ worker/uniter/uniter_test.go	2014-05-15 02:28:23 +0000
@@ -17,6 +17,7 @@
 	stdtesting "testing"
 	"time"
 
+	"github.com/juju/errors"
 	gt "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
@@ -24,7 +25,6 @@
 
 	"launchpad.net/juju-core/agent/tools"
 	corecharm "launchpad.net/juju-core/charm"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/juju/testing"
 
=== modified file 'worker/upgrader/upgrader_test.go'
--- worker/upgrader/upgrader_test.go	2014-04-14 12:36:13 +0000
+++ worker/upgrader/upgrader_test.go	2014-05-15 02:28:23 +0000
@@ -10,6 +10,7 @@
 	stdtesting "testing"
 	"time"
 
+	"github.com/juju/errors"
 	gc "launchpad.net/gocheck"
 	coretesting "launchpad.net/juju-core/testing"
 
@@ -18,7 +19,6 @@
 	agenttools "launchpad.net/juju-core/agent/tools"
 	envtesting "launchpad.net/juju-core/environs/testing"
 	envtools "launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/errors"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/state"