github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

filecache: Ignore "does not exist" errors in prune

Browse source 
Fixes #6326
Fixes #5745
This commit is contained in:
Bjørn Erik Pedersen 2019-09-12 17:24:34 +02:00
parent 77b23fe3db
commit fcfa6f33bb
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cache/filecache/filecache_pruner.go vendored
View file

@ -31,12 +31,15 @@ func (c Caches) Prune() (int, error) {
count, err := cache.Prune(false) count, err := cache.Prune(false)
counter += count
if err != nil { if err != nil {
if os.IsNotExist(err) {
continue
}
return counter, errors.Wrapf(err, "failed to prune cache %q", k) return counter, errors.Wrapf(err, "failed to prune cache %q", k)
} }
counter += count
} }
return counter, nil return counter, nil
@ -68,7 +71,11 @@ func (c *Cache) Prune(force bool) (int, error) {
_, err = f.Readdirnames(1) _, err = f.Readdirnames(1)
if err == io.EOF { if err == io.EOF {
// Empty dir. // Empty dir.
return c.Fs.Remove(name) err = c.Fs.Remove(name)
}
if err != nil && !os.IsNotExist(err) {
return err
} }
return nil return nil
@ -87,9 +94,13 @@ func (c *Cache) Prune(force bool) (int, error) {
if err == nil { if err == nil {
counter++ counter++
} }
if err != nil && !os.IsNotExist(err) {
return err return err
} }
}
return nil return nil
}) })