mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-22 08:35:57 +01:00
Code Activity

Fix handling of AutoSubgroups in readDescriptionFile.

Browse source 
We used to test AutoSubgroups before upgrading the description,
which would break handling of the (obsolete) AllowSubgroups
field.

Thanks to David Saulpic.
This commit is contained in:
Juliusz Chroboczek 2024-04-17 18:48:53 +02:00
parent 19dfccc3d5
commit 841d95d21c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
group/description.go
View file

@ -441,6 +441,15 @@ func readDescription(name string, allowSubgroups bool) (*Description, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = upgradeDescription(&desc)
if err != nil {
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
@ -450,15 +459,6 @@ func readDescription(name string, allowSubgroups bool) (*Description, error) {
desc.Description = "" desc.Description = ""
} }
desc.FileName = fileName
desc.fileSize = fi.Size()
desc.modTime = fi.ModTime()
err = upgradeDescription(&desc)
if err != nil {
return nil, err
}
return &desc, nil return &desc, nil
} }