Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(283)

Side by Side Diff: state/unit.go

Issue 93410043: Extract errors package to github.com/juju/errors
Patch Set: Created 9 years, 10 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012, 2013 Canonical Ltd. 1 // Copyright 2012, 2013 Canonical Ltd.
2 // Licensed under the AGPLv3, see LICENCE file for details. 2 // Licensed under the AGPLv3, see LICENCE file for details.
3 3
4 package state 4 package state
5 5
6 import ( 6 import (
7 stderrors "errors" 7 stderrors "errors"
8 "fmt" 8 "fmt"
9 "time" 9 "time"
10 10
11 "github.com/juju/errors"
11 "github.com/juju/loggo" 12 "github.com/juju/loggo"
12 "labix.org/v2/mgo" 13 "labix.org/v2/mgo"
13 "labix.org/v2/mgo/bson" 14 "labix.org/v2/mgo/bson"
14 "labix.org/v2/mgo/txn" 15 "labix.org/v2/mgo/txn"
15 16
16 "launchpad.net/juju-core/charm" 17 "launchpad.net/juju-core/charm"
17 "launchpad.net/juju-core/constraints" 18 "launchpad.net/juju-core/constraints"
18 "launchpad.net/juju-core/errors"
19 "launchpad.net/juju-core/instance" 19 "launchpad.net/juju-core/instance"
20 "launchpad.net/juju-core/names" 20 "launchpad.net/juju-core/names"
21 "launchpad.net/juju-core/state/api/params" 21 "launchpad.net/juju-core/state/api/params"
22 "launchpad.net/juju-core/state/presence" 22 "launchpad.net/juju-core/state/presence"
23 "launchpad.net/juju-core/tools" 23 "launchpad.net/juju-core/tools"
24 "launchpad.net/juju-core/utils" 24 "launchpad.net/juju-core/utils"
25 "launchpad.net/juju-core/version" 25 "launchpad.net/juju-core/version"
26 ) 26 )
27 27
28 var unitLogger = loggo.GetLogger("juju.state.unit") 28 var unitLogger = loggo.GetLogger("juju.state.unit")
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after
1371 Assert: txn.DocExists, 1371 Assert: txn.DocExists,
1372 Update: bson.D{{"$set", bson.D{{"resolved", ResolvedNone}}}}, 1372 Update: bson.D{{"$set", bson.D{{"resolved", ResolvedNone}}}},
1373 }} 1373 }}
1374 err := u.st.runTransaction(ops) 1374 err := u.st.runTransaction(ops)
1375 if err != nil { 1375 if err != nil {
1376 return fmt.Errorf("cannot clear resolved mode for unit %q: %v", u, errors.NotFoundf("unit")) 1376 return fmt.Errorf("cannot clear resolved mode for unit %q: %v", u, errors.NotFoundf("unit"))
1377 } 1377 }
1378 u.doc.Resolved = ResolvedNone 1378 u.doc.Resolved = ResolvedNone
1379 return nil 1379 return nil
1380 } 1380 }
OLDNEW

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b