r.loginov/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Remove one level of indentation in swift path handling code

Browse source 
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
This commit is contained in:
Sylvain Baubeau 2015-05-29 16:14:12 +02:00
parent 75ce67c469
commit 4e619bc9b1
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/storage/driver/swift/swift.go
View file

@ -457,16 +457,18 @@ func (d *driver) swiftPath(path string) string {
func (d *driver) createParentFolder(path string) (string, error) { func (d *driver) createParentFolder(path string) (string, error) {
dir := gopath.Dir(path) dir := gopath.Dir(path)
if dir != "/" { if dir == "/" {
return dir, nil
}
_, _, err := d.Conn.Object(d.Container, d.swiftPath(dir)) _, _, err := d.Conn.Object(d.Container, d.swiftPath(dir))
if swiftErr, ok := err.(*swift.Error); ok && swiftErr.StatusCode == 404 { if swiftErr, ok := err.(*swift.Error); ok && swiftErr.StatusCode == 404 {
_, err := d.Conn.ObjectPut(d.Container, d.swiftPath(dir), bytes.NewReader(make([]byte, 0)), _, err := d.Conn.ObjectPut(d.Container, d.swiftPath(dir), bytes.NewReader(make([]byte, 0)),
false, "", "application/directory", nil) false, "", directoryMimeType, nil)
if err != nil { if err != nil {
return dir, err return dir, err
} }
} }
}
return dir, nil return dir, nil
} }