← Back to branch summary

~axwalk/juju-core/gocryptossh-proxycommand

« back to all changes in this revision

Viewing changes to worker/uniter/uniter.go

  • Committer: Tim Penhey
  • Date: 2013-04-14 22:12:49 UTC
  • mto: (1142.2.6 string-set)
  • mto: This revision was merged to the branch mainline in revision 1152.
  • Revision ID: tim.penhey@canonical.com-20130414221249-tk8f6emctl1f8w63
Trivial rename of trivial -> utils.

Show diffs side-by-side

added added

removed removed

Lines of Context:
worker/uniter/uniter.go
10
10
        "launchpad.net/juju-core/log"
11
11
        "launchpad.net/juju-core/state"
12
12
        "launchpad.net/juju-core/state/watcher"
13
 
        "launchpad.net/juju-core/trivial"
 
13
        "launchpad.net/juju-core/utils"
14
14
        "launchpad.net/juju-core/worker/uniter/charm"
15
15
        "launchpad.net/juju-core/worker/uniter/hook"
16
16
        "launchpad.net/juju-core/worker/uniter/jujuc"
103
103
}
104
104
 
105
105
func (u *Uniter) init(name string) (err error) {
106
 
        defer trivial.ErrorContextf(&err, "failed to initialize uniter for unit %q", name)
 
106
        defer utils.ErrorContextf(&err, "failed to initialize uniter for unit %q", name)
107
107
        u.unit, err = u.st.Unit(name)
108
108
        if err != nil {
109
109
                return err