Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor client/upload changes 

Change-Id: I02ec44ff72575e547fee5e44667d648cf06b54f8
This commit is contained in:
Brad Fitzpatrick 2011-09-15 21:52:33 -07:00
parent 3eb3b994ca
commit d35c4a4ddc
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clients/go/camput/camput.go
View File

@ -70,6 +70,13 @@ func (up *Uploader) UploadFileBlob(filename string) (*client.PutResult, os.Error
if *flagVerbose {
log.Printf("Uploading filename: %s", filename)
}
fi, err := os.Stat(filename)
if err != nil {
return nil, err
}
if !fi.IsRegular() {
return nil, fmt.Errorf("%q is not a regular file", filename)
}
file, err := os.Open(filename)
if err != nil {
return nil, err

4
lib/go/camli/client/upload.go
View File

@ -250,9 +250,7 @@ func (c *Client) Upload(h *UploadHandle) (*PutResult, os.Error) {
if err != nil {
return errorf("stat http error: %v", err)
}
if resp.Body != nil {
defer resp.Body.Close()
}
defer resp.Body.Close()
if resp.StatusCode != 200 {
return errorf("stat response had http status %d", resp.StatusCode)