← Back to branch summary

~menno.smits/juju-core/1194481-relation_name_in_status.0

« back to all changes in this revision

Viewing changes to environs/sshstorage/storage.go

  • Committer: Tarmac
  • Author(s): Tim Penhey
  • Date: 2014-05-15 02:49:48 UTC
  • mfrom: (2722.2.11 juju-errors)
  • Revision ID: tarmac-20140515024948-mdinmvuq3nkxrxxi
[r=thumper] 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/

Show diffs side-by-side

added added

removed removed

Lines of Context:
environs/sshstorage/storage.go
7
7
        "bufio"
8
8
        "bytes"
9
9
        "encoding/base64"
10
 
        "errors"
11
10
        "fmt"
12
11
        "io"
13
12
        "io/ioutil"
16
15
        "strconv"
17
16
        "strings"
18
17
 
 
18
        "github.com/juju/errors"
19
19
        "github.com/juju/loggo"
20
20
 
21
 
        coreerrors "launchpad.net/juju-core/errors"
22
21
        "launchpad.net/juju-core/utils"
23
22
        "launchpad.net/juju-core/utils/ssh"
24
23
)
253
252
        if err != nil {
254
253
                err := err.(SSHStorageError)
255
254
                if strings.Contains(err.Output, "No such file") {
256
 
                        return nil, coreerrors.NewNotFound(err, "")
 
255
                        return nil, errors.NewNotFound(err, "")
257
256
                }
258
257
                return nil, err
259
258
        }