Update layerspathModified before reading the contents
... to ensure that any changes after we start reading the data trigger a future reload. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
parent
b321881403
commit
b5a28e2648
16
layers.go
16
layers.go
|
|
@ -344,6 +344,13 @@ func (r *layerStore) layerspath() string {
|
||||||
func (r *layerStore) Load() error {
|
func (r *layerStore) Load() error {
|
||||||
shouldSave := false
|
shouldSave := false
|
||||||
rpath := r.layerspath()
|
rpath := r.layerspath()
|
||||||
|
info, err := os.Stat(rpath)
|
||||||
|
if err != nil && !os.IsNotExist(err) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if info != nil {
|
||||||
|
r.layerspathModified = info.ModTime()
|
||||||
|
}
|
||||||
data, err := ioutil.ReadFile(rpath)
|
data, err := ioutil.ReadFile(rpath)
|
||||||
if err != nil && !os.IsNotExist(err) {
|
if err != nil && !os.IsNotExist(err) {
|
||||||
return err
|
return err
|
||||||
|
|
@ -423,15 +430,6 @@ func (r *layerStore) Load() error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
info, statErr := os.Stat(r.layerspath())
|
|
||||||
if statErr != nil && !os.IsNotExist(statErr) {
|
|
||||||
return statErr
|
|
||||||
}
|
|
||||||
|
|
||||||
if info != nil {
|
|
||||||
r.layerspathModified = info.ModTime()
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue