~ubuntu-branches/ubuntu/vivid/juju-core/vivid-updates

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/api/machiner/machiner.go

  • Committer: Package Import Robot
  • Author(s): Curtis C. Hovey
  • Date: 2015-09-29 19:43:29 UTC
  • mfrom: (47.1.4 wily-proposed)
  • Revision ID: package-import@ubuntu.com-20150929194329-9y496tbic30hc7vp
Tags: 1.24.6-0ubuntu1~15.04.1
Backport of 1.24.6 from wily. (LP: #1500916, #1497087)

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
package machiner
5
5
 
6
6
import (
 
7
        "github.com/juju/errors"
7
8
        "github.com/juju/names"
8
9
 
9
10
        "github.com/juju/juju/api/base"
38
39
func (st *State) Machine(tag names.MachineTag) (*Machine, error) {
39
40
        life, err := st.machineLife(tag)
40
41
        if err != nil {
41
 
                return nil, err
 
42
                return nil, errors.Annotate(err, "can't get life for machine")
42
43
        }
43
44
        return &Machine{
44
45
                tag:  tag,