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

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/environs/storage/storage.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-29 11:40:20 UTC
  • mfrom: (23.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20140129114020-ejieitm8smtt5vln
Tags: 1.17.1-0ubuntu2
d/tests/local-provider: Don't fail tests if ~/.juju is present as its
created by the juju version command. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
import (
7
7
        "fmt"
8
8
        "io"
9
 
        "path/filepath"
 
9
        "path"
10
10
 
11
11
        "launchpad.net/juju-core/environs/simplestreams"
12
12
        "launchpad.net/juju-core/utils"
91
91
        return &storageSimpleStreamsDataSource{basePath, storage, false}
92
92
}
93
93
 
94
 
func (s *storageSimpleStreamsDataSource) relpath(path string) string {
95
 
        relpath := path
 
94
func (s *storageSimpleStreamsDataSource) relpath(storagePath string) string {
 
95
        relpath := storagePath
96
96
        if s.basePath != "" {
97
 
                relpath = filepath.Join(s.basePath, relpath)
 
97
                relpath = path.Join(s.basePath, relpath)
98
98
        }
99
99
        return relpath
100
100
}