fixed housekeeping not finding missing packages introduced in ff21894aac

This commit is contained in:
2022-12-27 18:52:10 +01:00
parent 6088643ec4
commit 2169cec100

View File

@@ -594,7 +594,6 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
} }
// check all packages from db for existence // check all packages from db for existence
log.Debugf("[HK/%s] checking existing package-files", fullRepo)
dbPackages, err := db.DbPackage.Query().Where( dbPackages, err := db.DbPackage.Query().Where(
dbpackage.And( dbpackage.And(
dbpackage.RepositoryEQ(dbpackage.Repository(repo)), dbpackage.RepositoryEQ(dbpackage.Repository(repo)),
@@ -604,6 +603,8 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
return err return err
} }
log.Debugf("[HK/%s] checking %d existing package-files", fullRepo, len(dbPackages))
for _, dbPkg := range dbPackages { for _, dbPkg := range dbPackages {
pkg := &ProtoPackage{ pkg := &ProtoPackage{
Pkgbase: dbPkg.Pkgbase, Pkgbase: dbPkg.Pkgbase,
@@ -629,6 +630,7 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
for _, splitPkg := range dbPkg.Packages { for _, splitPkg := range dbPkg.Packages {
pkgFile := filepath.Join(conf.Basedir.Repo, fullRepo, "os", conf.Arch, pkgFile := filepath.Join(conf.Basedir.Repo, fullRepo, "os", conf.Arch,
splitPkg+"-"+dbPkg.RepoVersion+"-"+conf.Arch+".pkg.tar.zst") splitPkg+"-"+dbPkg.RepoVersion+"-"+conf.Arch+".pkg.tar.zst")
_, err = os.Stat(pkgFile)
switch { switch {
case os.IsNotExist(err): case os.IsNotExist(err):
missingSplits = append(missingSplits, splitPkg) missingSplits = append(missingSplits, splitPkg)