titaniumtown/ALHP.GO
1
0
Fork 0
forked from ALHP/ALHP.GO
Code Issues Pull Requests Projects Releases Wiki Activity

fixed failed packages not marked as such

Browse Source
This commit is contained in:
Giovanni Harting
2021-10-27 16:58:12 +02:00
parent be8b349907
commit 5eb003daab
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main.go
View File

@@ -208,10 +208,12 @@ func (b *BuildManager) parseWorker() {
if contains(info.Arch, "any") { if contains(info.Arch, "any") {
log.Debugf("Skipped %s: any-Package", info.Pkgbase) log.Debugf("Skipped %s: any-Package", info.Pkgbase)
dbPkg.SkipReason = "arch = any" dbPkg.SkipReason = "arch = any"
dbPkg.Status = dbpackage.StatusSkipped
skipping = true skipping = true
} else if contains(conf.Blacklist.Packages, info.Pkgbase) { } else if contains(conf.Blacklist.Packages, info.Pkgbase) {
log.Debugf("Skipped %s: blacklisted package", info.Pkgbase) log.Debugf("Skipped %s: blacklisted package", info.Pkgbase)
dbPkg.SkipReason = "blacklisted" dbPkg.SkipReason = "blacklisted"
dbPkg.Status = dbpackage.StatusSkipped
skipping = true skipping = true
} else if contains(info.MakeDepends, "ghc") || contains(info.MakeDepends, "haskell-ghc") || contains(info.Depends, "ghc") || contains(info.Depends, "haskell-ghc") { } else if contains(info.MakeDepends, "ghc") || contains(info.MakeDepends, "haskell-ghc") || contains(info.Depends, "ghc") || contains(info.Depends, "haskell-ghc") {
// Skip Haskell packages for now, as we are facing linking problems with them, // Skip Haskell packages for now, as we are facing linking problems with them,
@@ -219,15 +221,17 @@ func (b *BuildManager) parseWorker() {
// https://git.harting.dev/anonfunc/ALHP.GO/issues/11 // https://git.harting.dev/anonfunc/ALHP.GO/issues/11
log.Debugf("Skipped %s: haskell package", info.Pkgbase) log.Debugf("Skipped %s: haskell package", info.Pkgbase)
dbPkg.SkipReason = "blacklisted (haskell)" dbPkg.SkipReason = "blacklisted (haskell)"
dbPkg.Status = dbpackage.StatusSkipped
skipping = true skipping = true
} else if isPkgFailed(pkg) { } else if isPkgFailed(pkg) {
log.Debugf("Skipped %s: failed build", info.Pkgbase) log.Debugf("Skipped %s: failed build", info.Pkgbase)
dbPkg.SkipReason = "" dbPkg.SkipReason = ""
dbPkg.Status = dbpackage.StatusFailed
skipping = true skipping = true
} }
if skipping { if skipping {
dbPkg = dbPkg.Update().SetStatus(dbpackage.StatusSkipped).SetSkipReason(dbPkg.SkipReason).SetHash(pkg.Hash).SaveX(context.Background()) dbPkg = dbPkg.Update().SetStatus(dbPkg.Status).SetSkipReason(dbPkg.SkipReason).SetHash(pkg.Hash).SaveX(context.Background())
b.repoPurge[pkg.FullRepo] <- pkg b.repoPurge[pkg.FullRepo] <- pkg
b.parseWG.Done() b.parseWG.Done()
continue continue