aboutsummaryrefslogtreecommitdiff
path: root/weed/filer/filer.go
diff options
context:
space:
mode:
authorbingoohuang <bingoo.huang@gmail.com>2021-04-26 17:15:17 +0800
committerGitHub <noreply@github.com>2021-04-26 17:15:17 +0800
commit4ee58922eff61a5a4ca29c0b4829b097a498549e (patch)
tree301805fef4aa5d0096bfb1510536f7a009b661e7 /weed/filer/filer.go
parent5cdff56731d6be220d4d6e8624b859520dfeb021 (diff)
parent86185262bb86e31f9a2f71e85d02df2502c7ad40 (diff)
downloadseaweedfs-4ee58922eff61a5a4ca29c0b4829b097a498549e.tar.xz
seaweedfs-4ee58922eff61a5a4ca29c0b4829b097a498549e.zip
Merge pull request #6 from chrislusf/master
Diffstat (limited to 'weed/filer/filer.go')
-rw-r--r--weed/filer/filer.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/weed/filer/filer.go b/weed/filer/filer.go
index e59887763..effdc0e4e 100644
--- a/weed/filer/filer.go
+++ b/weed/filer/filer.go
@@ -241,12 +241,12 @@ func (f *Filer) UpdateEntry(ctx context.Context, oldEntry, entry *Entry) (err er
if oldEntry != nil {
entry.Attr.Crtime = oldEntry.Attr.Crtime
if oldEntry.IsDirectory() && !entry.IsDirectory() {
- glog.Errorf("existing %s is a directory", entry.FullPath)
- return fmt.Errorf("existing %s is a directory", entry.FullPath)
+ glog.Errorf("existing %s is a directory", oldEntry.FullPath)
+ return fmt.Errorf("existing %s is a directory", oldEntry.FullPath)
}
if !oldEntry.IsDirectory() && entry.IsDirectory() {
- glog.Errorf("existing %s is a file", entry.FullPath)
- return fmt.Errorf("existing %s is a file", entry.FullPath)
+ glog.Errorf("existing %s is a file", oldEntry.FullPath)
+ return fmt.Errorf("existing %s is a file", oldEntry.FullPath)
}
}
return f.Store.UpdateEntry(ctx, entry)