← Back to branch summary

~ubuntu-branches/ubuntu/trusty/juju-core/trusty-proposed

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/jujud/main.go

  • Committer: Package Import Robot
  • Author(s): Robie Basak
  • Date: 2015-07-15 13:09:07 UTC
  • mfrom: (35.1.15 wily-proposed)
  • Revision ID: package-import@ubuntu.com-20150715130907-wqak1zpebzzdvy3q
Tags: 1.22.6-0ubuntu1~14.04.1
https://launchpad.net/bugs/1469744
* No change backport to 14.04 (LP: #1469744). This results in the
  following packaging delta from the previous 1.20.11-0ubuntu0.14.04.1
  in trusty-updates:
  - distro-info added and libgo5 removed from Build-Depends.
  - Standards-Version bumped.
  - cloud-image-utils | cloud-utils added to juju-local Depends.
  - d/copyright updated.
  - dep8 tests updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/cmd/jujud/main.go
116
116
                Doc:  jujudDoc,
117
117
        })
118
118
        jujud.Log.Factory = &writerFactory{}
119
 
        jujud.Register(&BootstrapCommand{})
 
119
        jujud.Register(NewBootstrapCommand())
120
120
 
121
121
        // TODO(katco-): AgentConf type is doing too much. The
122
122
        // MachineAgent type has called out the seperate concerns; the
123
123
        // AgentConf should be split up to follow suite.
124
 
        var agentConf agentcmd.AgentConf
125
 
        machineAgentFactory := agentcmd.MachineAgentFactoryFn(&agentConf, &agentConf)
126
 
        jujud.Register(agentcmd.NewMachineAgentCmd(machineAgentFactory, &agentConf, &agentConf))
127
 
 
128
 
        jujud.Register(&UnitAgent{})
 
124
        agentConf := agentcmd.NewAgentConf("")
 
125
        machineAgentFactory := agentcmd.MachineAgentFactoryFn(agentConf, agentConf)
 
126
        jujud.Register(agentcmd.NewMachineAgentCmd(ctx, machineAgentFactory, agentConf, agentConf))
 
127
 
 
128
        a := NewUnitAgent()
 
129
        a.ctx = ctx
 
130
        jujud.Register(a)
 
131
 
129
132
        code = cmd.Main(jujud, ctx, args[1:])
130
133
        return code, nil
131
134
}