TrueCloudLab/rclone
16
0
Fork 3
Code Issues 6 Pull requests 1 Projects Releases 1 Packages Wiki Activity Actions

drive, acd: Tweak logging after changing Fs.Put so that it must cope with existing files

Browse source
This commit is contained in:
Nick Craig-Wood 2016-06-18 10:54:42 +01:00
parent 2cfb3834f2
commit cc6a776034
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
amazonclouddrive/amazonclouddrive.go
View file

@ -240,7 +240,7 @@ func (f *Fs) newFsObjectWithInfo(remote string, info *acd.Node) fs.Object {
} else { } else {
err := o.readMetaData() // reads info and meta, returning an error err := o.readMetaData() // reads info and meta, returning an error
if err != nil { if err != nil {
// logged already FsDebug("Failed to read info: %s", err) fs.Log(o, "Failed to read metadata: %s", err)
return nil return nil
} }
} }
@ -624,7 +624,6 @@ func (o *Object) readMetaData() (err error) {
return o.fs.shouldRetry(resp, err) return o.fs.shouldRetry(resp, err)
}) })
if err != nil { if err != nil {
fs.Debug(o, "Failed to read info: %s", err)
return err return err
} }
o.info = info.Node o.info = info.Node

8
drive/drive.go
View file

@ -360,7 +360,6 @@ func (f *Fs) newFsObjectWithInfoErr(remote string, info *drive.File) (fs.Object,
} else { } else {
err := o.readMetaData() // reads info and meta, returning an error err := o.readMetaData() // reads info and meta, returning an error
if err != nil { if err != nil {
// logged already fs.Debug("Failed to read info: %s", err)
return nil, err return nil, err
} }
} }
@ -371,8 +370,10 @@ func (f *Fs) newFsObjectWithInfoErr(remote string, info *drive.File) (fs.Object,
// //
// May return nil if an error occurred // May return nil if an error occurred
func (f *Fs) newFsObjectWithInfo(remote string, info *drive.File) fs.Object { func (f *Fs) newFsObjectWithInfo(remote string, info *drive.File) fs.Object {
o, _ := f.newFsObjectWithInfoErr(remote, info) o, err := f.newFsObjectWithInfoErr(remote, info)
// Errors have already been logged if err != nil {
fs.Log(o, "Failed to read metadata: %v", err)
}
return o return o
} }
@ -870,7 +871,6 @@ func (o *Object) readMetaData() (err error) {
return err return err
} }
if !found { if !found {
fs.Debug(o, "%v", errorObjectNotFound)
return errorObjectNotFound return errorObjectNotFound
} }
return nil return nil