UnbreakableMJ/ALHP.GO
1
0
Fork 0
forked from ALHP/ALHP.GO
Code Pull Requests Activity

add version to BuildPackage to keep track of successfully build package version

Browse Source
This commit is contained in:
Giovanni Harting
2021-07-13 19:18:35 +02:00
parent f8f1391797
commit ff323b41bd
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main.go
View File

@@ -66,6 +66,7 @@ type BuildPackage struct {
Repo string Repo string
March string March string
FullRepo string FullRepo string
Version string
} }
type BuildManager struct { type BuildManager struct {
@@ -263,6 +264,8 @@ func increasePkgRel(pkg *BuildPackage) {
_, err = f.WriteString(nStr) _, err = f.WriteString(nStr)
check(err) check(err)
pkg.Version = pkg.Version + ".1"
} }
func gitClean(pkg *BuildPackage) { func gitClean(pkg *BuildPackage) {
@@ -454,16 +457,15 @@ func (b *BuildManager) parseWorker() {
continue continue
} }
pkg.Srcinfo = info pkg.Srcinfo = info
var pkgVer string
if pkg.Srcinfo.Epoch == "" { if pkg.Srcinfo.Epoch == "" {
pkgVer = pkg.Srcinfo.Pkgver + "-" + pkg.Srcinfo.Pkgrel pkg.Version = pkg.Srcinfo.Pkgver + "-" + pkg.Srcinfo.Pkgrel
} else { } else {
pkgVer = pkg.Srcinfo.Epoch + ":" + pkg.Srcinfo.Pkgver + "-" + pkg.Srcinfo.Pkgrel pkg.Version = pkg.Srcinfo.Epoch + ":" + pkg.Srcinfo.Pkgver + "-" + pkg.Srcinfo.Pkgrel
} }
dbPkg := getDbPackage(pkg) dbPkg := getDbPackage(pkg)
dbLock.Lock() dbLock.Lock()
dbPkg = dbPkg.Update().SetUpdated(time.Now()).SetVersion(pkgVer).SaveX(context.Background()) dbPkg = dbPkg.Update().SetUpdated(time.Now()).SetVersion(pkg.Version).SaveX(context.Background())
dbLock.Unlock() dbLock.Unlock()
skipping := false skipping := false
@@ -506,8 +508,8 @@ func (b *BuildManager) parseWorker() {
dbLock.Lock() dbLock.Lock()
dbPkg = dbPkg.Update().SetRepoVersion(repoVer).SaveX(context.Background()) dbPkg = dbPkg.Update().SetRepoVersion(repoVer).SaveX(context.Background())
dbLock.Unlock() dbLock.Unlock()
if repoVer != "" && alpm.VerCmp(repoVer, pkgVer) > 0 { if repoVer != "" && alpm.VerCmp(repoVer, pkg.Version) > 0 {
log.Debugf("Skipped %s: Version in repo higher than in PKGBUILD (%s < %s)", info.Pkgbase, pkgVer, repoVer) log.Debugf("Skipped %s: Version in repo higher than in PKGBUILD (%s < %s)", info.Pkgbase, pkg.Version, repoVer)
dbLock.Lock() dbLock.Lock()
dbPkg = dbPkg.Update().SetStatus(LATEST).SetSkipReason("").SaveX(context.Background()) dbPkg = dbPkg.Update().SetStatus(LATEST).SetSkipReason("").SaveX(context.Background())
dbLock.Unlock() dbLock.Unlock()
@@ -750,7 +752,7 @@ func (b *BuildManager) repoWorker(repo string) {
dbPkg := getDbPackage(pkg) dbPkg := getDbPackage(pkg)
dbLock.Lock() dbLock.Lock()
dbPkg = dbPkg.Update().SetStatus(LATEST).SetSkipReason("").SetRepoVersion(getVersionFromRepo(pkg)).SaveX(context.Background()) dbPkg = dbPkg.Update().SetStatus(LATEST).SetSkipReason("").SetRepoVersion(pkg.Version).SaveX(context.Background())
dbLock.Unlock() dbLock.Unlock()
cmd = exec.Command("paccache", cmd = exec.Command("paccache",