← Back to branch summary

~cmars/juju-core/1.14-azure-compile-error

« back to all changes in this revision

Viewing changes to worker/uniter/uniter.go

Move common errors to erros package and remove dupe NotFoundError struct

Show diffs side-by-side

added added

removed removed

Lines of Context:
worker/uniter/uniter.go
10
10
        "launchpad.net/juju-core/charm/hooks"
11
11
        "launchpad.net/juju-core/cmd"
12
12
        "launchpad.net/juju-core/environs/agent"
 
13
        jujuerrors "launchpad.net/juju-core/errors"
13
14
        "launchpad.net/juju-core/log"
14
15
        "launchpad.net/juju-core/state"
15
16
        "launchpad.net/juju-core/state/watcher"
387
388
        for id, dir := range dirs {
388
389
                remove := false
389
390
                rel, err := u.st.Relation(id)
390
 
                if state.IsNotFound(err) {
 
391
                if jujuerrors.IsNotFoundError(err) {
391
392
                        remove = true
392
393
                } else if err != nil {
393
394
                        return err
433
434
                // were not previously known anyway.
434
435
                rel, err := u.st.Relation(id)
435
436
                if err != nil {
436
 
                        if state.IsNotFound(err) {
 
437
                        if jujuerrors.IsNotFoundError(err) {
437
438
                                continue
438
439
                        }
439
440
                        return nil, err