← Back to branch summary

~dstroppa/juju-core/joyent-provider-storage

« back to all changes in this revision

Viewing changes to environs/filestorage/filestorage.go

  • Committer: Daniele Stroppa
  • Date: 2014-01-08 15:58:10 UTC
  • mfrom: (1953.1.231 juju-core)
  • Revision ID: daniele.stroppa@joyent.com-20140108155810-xecbwrqkb5i0fyoe
Merging trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
environs/filestorage/filestorage.go
25
25
 
26
26
// NewFileStorageReader returns a new storage reader for
27
27
// a directory inside the local file system.
28
 
func NewFileStorageReader(path string) (storage.StorageReader, error) {
29
 
        p := filepath.Clean(path)
 
28
func NewFileStorageReader(path string) (reader storage.StorageReader, err error) {
 
29
        var p string
 
30
        if p, err = utils.NormalizePath(path); err != nil {
 
31
                return nil, err
 
32
        }
 
33
        if p, err = filepath.Abs(p); err != nil {
 
34
                return nil, err
 
35
        }
30
36
        fi, err := os.Stat(p)
31
37
        if err != nil {
32
38
                return nil, err