← Back to branch summary

~themue/juju-core/050-prepare-openstack

« back to all changes in this revision

Viewing changes to state/apiserver/machine/agent.go

  • Committer: Dimiter Naydenov
  • Date: 2013-07-29 15:15:41 UTC
  • mto: This revision was merged to the branch mainline in revision 1565.
  • Revision ID: dimiter.naydenov@canonical.com-20130729151541-zm8murwo9u7mtsdu
names: new package

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/apiserver/machine/agent.go
6
6
package machine
7
7
 
8
8
import (
 
9
        "launchpad.net/juju-core/names"
9
10
        "launchpad.net/juju-core/state"
10
11
        "launchpad.net/juju-core/state/api/params"
11
12
        "launchpad.net/juju-core/state/apiserver/common"
57
58
                err = common.ErrPerm
58
59
                return
59
60
        }
60
 
        machine, err := api.st.Machine(state.MachineIdFromTag(tag))
 
61
        id, err := names.MachineIdFromTag(tag)
 
62
        if err != nil {
 
63
                return
 
64
        }
 
65
        machine, err := api.st.Machine(id)
61
66
        if err != nil {
62
67
                return
63
68
        }