| Index: environs/imagemetadata/urls.go |
| === modified file 'environs/imagemetadata/urls.go' |
| --- environs/imagemetadata/urls.go 2013-09-12 17:00:14 +0000 |
| +++ environs/imagemetadata/urls.go 2013-09-20 13:53:25 +0000 |
| @@ -20,9 +20,6 @@ |
| // be considered. |
| func GetMetadataSources(env environs.ConfigGetter) ([]simplestreams.DataSource, error) { |
| var sources []simplestreams.DataSource |
| - if userURL, ok := env.Config().ImageMetadataURL(); ok { |
| - sources = append(sources, simplestreams.NewURLDataSource(userURL)) |
| - } |
| if custom, ok := env.(SupportsCustomSources); ok { |
| customSources, err := custom.GetImageSources() |
| if err != nil { |
| @@ -30,6 +27,9 @@ |
| } |
| sources = append(sources, customSources...) |
| } |
| + if userURL, ok := env.Config().ImageMetadataURL(); ok { |
| + sources = append(sources, simplestreams.NewURLDataSource(userURL)) |
| + } |
| if DefaultBaseURL != "" { |
| sources = append(sources, simplestreams.NewURLDataSource(DefaultBaseURL)) |
