Mirrors/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-09-01 14:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed error when attempting to read empty database

Browse Source
This commit is contained in:
dancheg97 2023-06-24 17:27:39 +03:00
parent e399ce8452
commit e2b12f2db7
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/packages/arch/metadata.go
View File

@ -256,7 +256,7 @@ func readEntries(dbarchive []byte) (map[string][]byte, error) {
gzf, err := gzip.NewReader(bytes.NewReader(dbarchive))
if err != nil {
fmt.Println(err)
os.Exit(1)
return map[string][]byte{}, nil
}
var entries = map[string][]byte{}

24
services/packages/arch/file_manager.go
View File

@ -98,22 +98,22 @@ func UpdatePacmanDatabases(ctx *context.Context, md *arch.Metadata, distro, owne
db := arch.Join(owner, distro, architecture, setting.Domain, "db")
dbkey := packages.BlobHash256Key(db)
o, err := cs.Get(dbkey)
var dbdata []byte
dbobj, err := cs.Get(dbkey)
if err == nil {
dbdata, err = io.ReadAll(dbobj)
if err != nil {
return err
}
}
newdata, err := arch.UpdatePacmanDbEntry(dbdata, md)
if err != nil {
return err
}
data, err := io.ReadAll(o)
if err != nil {
return err
}
udata, err := arch.UpdatePacmanDbEntry(data, md)
if err != nil {
return err
}
err = cs.Save(dbkey, bytes.NewReader(udata), int64(len(udata)))
err = cs.Save(dbkey, bytes.NewReader(newdata), int64(len(newdata)))
if err != nil {
return err
}