OLD | NEW |
1 package main | 1 package main |
2 | 2 |
3 import ( | 3 import ( |
4 "fmt" | 4 "fmt" |
5 "launchpad.net/gnuflag" | 5 "launchpad.net/gnuflag" |
6 "launchpad.net/juju-core/cmd" | 6 "launchpad.net/juju-core/cmd" |
7 "launchpad.net/juju-core/environs" | 7 "launchpad.net/juju-core/environs" |
8 "launchpad.net/juju-core/environs/config" | 8 "launchpad.net/juju-core/environs/config" |
9 "launchpad.net/juju-core/juju" | 9 "launchpad.net/juju-core/juju" |
10 "launchpad.net/juju-core/state" | 10 "launchpad.net/juju-core/state" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 cfg, err := c.conn.State.EnvironConfig() | 66 cfg, err := c.conn.State.EnvironConfig() |
67 if err != nil { | 67 if err != nil { |
68 return err | 68 return err |
69 } | 69 } |
70 c.agentVersion = cfg.AgentVersion() | 70 c.agentVersion = cfg.AgentVersion() |
71 c.toolsList, err = environs.ListTools(c.conn.Environ, c.agentVersion.Maj
or) | 71 c.toolsList, err = environs.ListTools(c.conn.Environ, c.agentVersion.Maj
or) |
72 if err != nil { | 72 if err != nil { |
73 return err | 73 return err |
74 } | 74 } |
75 if c.UploadTools { | 75 if c.UploadTools { |
76 » » var forceVersion *version.Binary | 76 » » var forceVersion *version.Number |
77 if c.BumpVersion { | 77 if c.BumpVersion { |
78 vers := c.bumpedVersion() | 78 vers := c.bumpedVersion() |
79 » » » forceVersion = &vers | 79 » » » forceVersion = &vers.Number |
80 c.Version = vers.Number | 80 c.Version = vers.Number |
81 } | 81 } |
82 tools, err := putTools(c.conn.Environ.Storage(), forceVersion) | 82 tools, err := putTools(c.conn.Environ.Storage(), forceVersion) |
83 if err != nil { | 83 if err != nil { |
84 return err | 84 return err |
85 } | 85 } |
86 c.toolsList.Private = append(c.toolsList.Private, tools) | 86 c.toolsList.Private = append(c.toolsList.Private, tools) |
87 } | 87 } |
88 if c.Version == (version.Number{}) { | 88 if c.Version == (version.Number{}) { |
89 c.Version, err = c.newestVersion() | 89 c.Version, err = c.newestVersion() |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 } | 158 } |
159 attrs := cfg.AllAttrs() | 159 attrs := cfg.AllAttrs() |
160 attrs["agent-version"] = vers.String() | 160 attrs["agent-version"] = vers.String() |
161 attrs["development"] = development | 161 attrs["development"] = development |
162 cfg, err = config.New(attrs) | 162 cfg, err = config.New(attrs) |
163 if err != nil { | 163 if err != nil { |
164 panic(fmt.Errorf("config refused agent-version: %v", err)) | 164 panic(fmt.Errorf("config refused agent-version: %v", err)) |
165 } | 165 } |
166 return st.SetEnvironConfig(cfg) | 166 return st.SetEnvironConfig(cfg) |
167 } | 167 } |
OLD | NEW |