Upgrade description after setting filename.
Otherwise warning messages during upgrading cannot print the filename.
This commit is contained in:
@@ -441,15 +441,15 @@ func readDescription(name string, allowSubgroups bool) (*Description, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
desc.FileName = fileName
|
||||||
|
desc.fileSize = fi.Size()
|
||||||
|
desc.modTime = fi.ModTime()
|
||||||
|
|
||||||
err = upgradeDescription(&desc)
|
err = upgradeDescription(&desc)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
desc.FileName = fileName
|
|
||||||
desc.fileSize = fi.Size()
|
|
||||||
desc.modTime = fi.ModTime()
|
|
||||||
|
|
||||||
if isSubgroup {
|
if isSubgroup {
|
||||||
if !desc.AutoSubgroups {
|
if !desc.AutoSubgroups {
|
||||||
return nil, os.ErrNotExist
|
return nil, os.ErrNotExist
|
||||||
|
|||||||
Reference in New Issue
Block a user