← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to cmd/jujud/upgrade.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/jujud/upgrade.go
47
47
        if err != nil {
48
48
                return err
49
49
        }
50
 
        log.Infof("cmd/jujud: upgrader upgraded from %v to %v (%q)", e.OldTools.Binary, tools.Binary, tools.URL)
 
50
        log.Infof("upgrader upgraded from %v to %v (%q)", e.OldTools.Binary, tools.Binary, tools.URL)
51
51
        return nil
52
52
}
53
53
 
95
95
                // Don't abort everything because we can't find the tools directory.
96
96
                // The problem should sort itself out as we will immediately
97
97
                // download some more tools and upgrade.
98
 
                log.Warningf("cmd/jujud: upgrader cannot read current tools: %v", err)
 
98
                log.Warningf("upgrader cannot read current tools: %v", err)
99
99
                currentTools = &state.Tools{
100
100
                        Binary: version.Current,
101
101
                }
146
146
                        if environ == nil {
147
147
                                environ, err = environs.New(cfg)
148
148
                                if err != nil {
149
 
                                        log.Errorf("cmd/jujud: upgrader loaded invalid initial environment configuration: %v", err)
 
149
                                        log.Errorf("upgrader loaded invalid initial environment configuration: %v", err)
150
150
                                        break
151
151
                                }
152
152
                        } else {
153
153
                                err = environ.SetConfig(cfg)
154
154
                                if err != nil {
155
 
                                        log.Warningf("cmd/jujud: upgrader loaded invalid environment configuration: %v", err)
 
155
                                        log.Warningf("upgrader loaded invalid environment configuration: %v", err)
156
156
                                        // continue on, because the version number is still significant.
157
157
                                }
158
158
                        }
188
188
                        }
189
189
                        tools, err := environs.FindTools(environ, binary, flags)
190
190
                        if err != nil {
191
 
                                log.Errorf("cmd/jujud: upgrader error finding tools for %v: %v", binary, err)
 
191
                                log.Errorf("upgrader error finding tools for %v: %v", binary, err)
192
192
                                noDelay()
193
193
                                // TODO(rog): poll until tools become available.
194
194
                                break
196
196
                        if tools.Binary != binary {
197
197
                                if tools.Number == version.Current.Number {
198
198
                                        // TODO(rog): poll until tools become available.
199
 
                                        log.Warningf("cmd/jujud: upgrader: version %v requested but found only current version: %v", binary, tools.Number)
 
199
                                        log.Warningf("upgrader: version %v requested but found only current version: %v", binary, tools.Number)
200
200
                                        noDelay()
201
201
                                        break
202
202
                                }
203
 
                                log.Warningf("cmd/jujud: upgrader cannot find exact tools match for %s; using %s instead", binary, tools.Binary)
 
203
                                log.Warningf("upgrader cannot find exact tools match for %s; using %s instead", binary, tools.Binary)
204
204
                        }
205
205
                        if tools, err := agent.ReadTools(u.dataDir, tools.Binary); err == nil {
206
206
                                // The best available tools have already been downloaded, so use them.
207
207
                                return u.upgradeReady(currentTools, tools)
208
208
                        }
209
209
 
210
 
                        log.Infof("cmd/jujud: upgrader downloading %q", tools.URL)
 
210
                        log.Infof("upgrader downloading %q", tools.URL)
211
211
                        download = downloader.New(tools.URL, "")
212
212
                        downloadTools = tools
213
213
                        downloadDone = download.Done()
215
215
                        tools := downloadTools
216
216
                        download, downloadTools, downloadDone = nil, nil, nil
217
217
                        if status.Err != nil {
218
 
                                log.Errorf("cmd/jujud: upgrader download of %v failed: %v", tools.Binary, status.Err)
 
218
                                log.Errorf("upgrader download of %v failed: %v", tools.Binary, status.Err)
219
219
                                noDelay()
220
220
                                break
221
221
                        }
222
222
                        err := agent.UnpackTools(u.dataDir, tools, status.File)
223
223
                        status.File.Close()
224
224
                        if err := os.Remove(status.File.Name()); err != nil {
225
 
                                log.Warningf("cmd/jujud: upgrader cannot remove temporary download file: %v", err)
 
225
                                log.Warningf("upgrader cannot remove temporary download file: %v", err)
226
226
                        }
227
227
                        if err != nil {
228
 
                                log.Errorf("cmd/jujud: upgrader cannot unpack %v tools: %v", tools.Binary, err)
 
228
                                log.Errorf("upgrader cannot unpack %v tools: %v", tools.Binary, err)
229
229
                                noDelay()
230
230
                                break
231
231
                        }