← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to state/annotator.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/annotator.go
4
4
        "fmt"
5
5
        "labix.org/v2/mgo"
6
6
        "labix.org/v2/mgo/txn"
7
 
        "launchpad.net/juju-core/trivial"
 
7
        "launchpad.net/juju-core/utils"
8
8
        "strings"
9
9
)
10
10
 
29
29
 
30
30
// SetAnnotations adds key/value pairs to annotations in MongoDB.
31
31
func (a *annotator) SetAnnotations(pairs map[string]string) (err error) {
32
 
        defer trivial.ErrorContextf(&err, "cannot update annotations on %s", a.tag)
 
32
        defer utils.ErrorContextf(&err, "cannot update annotations on %s", a.tag)
33
33
        if len(pairs) == 0 {
34
34
                return nil
35
35
        }