Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(10)

Delta Between Two Patch Sets: cmd/juju/bootstrap.go

Issue 13053043: environs/*: move providers into provider
Left Patch Set: environs/*: move providers into provider Created 11 years, 7 months ago
Right Patch Set: environs/*: move providers into provider Created 11 years, 7 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « cmd/builddb/main.go ('k') | cmd/juju/bootstrap_test.go » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 // Copyright 2012, 2013 Canonical Ltd. 1 // Copyright 2012, 2013 Canonical Ltd.
2 // Licensed under the AGPLv3, see LICENCE file for details. 2 // Licensed under the AGPLv3, see LICENCE file for details.
3 3
4 package main 4 package main
5 5
6 import ( 6 import (
7 "fmt" 7 "fmt"
8 "strings" 8 "strings"
9 9
10 "launchpad.net/gnuflag" 10 "launchpad.net/gnuflag"
11 "launchpad.net/loggo" 11 "launchpad.net/loggo"
12 12
13 "launchpad.net/juju-core/charm" 13 "launchpad.net/juju-core/charm"
14 "launchpad.net/juju-core/cmd" 14 "launchpad.net/juju-core/cmd"
15 "launchpad.net/juju-core/constraints" 15 "launchpad.net/juju-core/constraints"
16 "launchpad.net/juju-core/environs" 16 "launchpad.net/juju-core/environs"
17 "launchpad.net/juju-core/environs/config" 17 "launchpad.net/juju-core/environs/config"
18 "launchpad.net/juju-core/environs/provider"
19 "launchpad.net/juju-core/environs/sync" 18 "launchpad.net/juju-core/environs/sync"
20 "launchpad.net/juju-core/errors" 19 "launchpad.net/juju-core/errors"
20 "launchpad.net/juju-core/provider"
21 "launchpad.net/juju-core/utils/set" 21 "launchpad.net/juju-core/utils/set"
22 "launchpad.net/juju-core/version" 22 "launchpad.net/juju-core/version"
23 ) 23 )
24 24
25 // BootstrapCommand is responsible for launching the first machine in a juju 25 // BootstrapCommand is responsible for launching the first machine in a juju
26 // environment, and setting up everything necessary to continue working. 26 // environment, and setting up everything necessary to continue working.
27 type BootstrapCommand struct { 27 type BootstrapCommand struct {
28 cmd.EnvCommandBase 28 cmd.EnvCommandBase
29 Constraints constraints.Value 29 Constraints constraints.Value
30 UploadTools bool 30 UploadTools bool
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 // probably upload, based on cfg. 148 // probably upload, based on cfg.
149 func getUploadSeries(cfg *config.Config, series []string) []string { 149 func getUploadSeries(cfg *config.Config, series []string) []string {
150 unique := set.NewStrings(series...) 150 unique := set.NewStrings(series...)
151 if unique.IsEmpty() { 151 if unique.IsEmpty() {
152 unique.Add(version.Current.Series) 152 unique.Add(version.Current.Series)
153 unique.Add(config.DefaultSeries) 153 unique.Add(config.DefaultSeries)
154 unique.Add(cfg.DefaultSeries()) 154 unique.Add(cfg.DefaultSeries())
155 } 155 }
156 return unique.Values() 156 return unique.Values()
157 } 157 }
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b