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

try resoling multiple PKGBUILD from mirror repo

Browse Source
This commit is contained in:
Giovanni Harting
2021-10-29 08:52:08 +02:00
parent 5eb003daab
commit aca9487b49
1 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
utils.go
View File

@@ -284,7 +284,7 @@ func initALPM(root string, dbpath string) (*alpm.Handle, error) {
return h, nil return h, nil
} }
func getSVN2GITVersion(pkg *BuildPackage) (string, error) { func getSVN2GITVersion(pkg *BuildPackage, h *alpm.Handle) (string, error) {
if pkg.Pkgbuild == "" && pkg.Pkgbase == "" { if pkg.Pkgbuild == "" && pkg.Pkgbase == "" {
return "", fmt.Errorf("invalid arguments") return "", fmt.Errorf("invalid arguments")
} }
@@ -306,8 +306,42 @@ func getSVN2GITVersion(pkg *BuildPackage) (string, error) {
} }
} }
if len(fPkgbuilds) > 1 {
log.Infof("%s: multiple PKGBUILD found, try resolving from mirror", pkg.Pkgbase)
dbs, err := h.SyncDBs()
if err != nil {
return "", err
}
iPackage, err := dbs.FindSatisfier(pkg.Pkgbase)
if err != nil {
return "", err
}
pkgloop:
for _, pkgbuild := range fPkgbuilds {
repo := strings.Split(filepath.Base(filepath.Dir(pkgbuild)), "-")[0]
upstreamA := strings.Split(filepath.Dir(pkgbuild), "/")
upstream := upstreamA[len(upstreamA)-4]
switch upstream {
case "upstream-core-extra":
if iPackage.DB().Name() == repo && (repo == "extra" || repo == "core") {
fPkgbuilds = []string{pkgbuild}
break pkgloop
}
case "upstream-community":
if iPackage.DB().Name() == repo && repo == "community" {
fPkgbuilds = []string{pkgbuild}
break pkgloop
}
}
}
if len(fPkgbuilds) > 1 { if len(fPkgbuilds) > 1 {
return "", MultiplePKGBUILDError{fmt.Errorf("%s: multiple PKGBUILD found: %s", pkg.Pkgbase, fPkgbuilds)} return "", MultiplePKGBUILDError{fmt.Errorf("%s: multiple PKGBUILD found: %s", pkg.Pkgbase, fPkgbuilds)}
}
log.Infof("%s: resolving successful: MirrorRepo=%s; PKGBUILD chosen: %s", pkg.Pkgbase, iPackage.DB().Name(), fPkgbuilds[0])
} else if len(fPkgbuilds) == 0 { } else if len(fPkgbuilds) == 0 {
return "", fmt.Errorf("%s: no matching PKGBUILD found (searched: %s, canidates: %s)", pkg.Pkgbase, filepath.Join(conf.Basedir.Upstream, "**/"+pkg.Pkgbase+"/repos/*/PKGBUILD"), pkgBuilds) return "", fmt.Errorf("%s: no matching PKGBUILD found (searched: %s, canidates: %s)", pkg.Pkgbase, filepath.Join(conf.Basedir.Upstream, "**/"+pkg.Pkgbase+"/repos/*/PKGBUILD"), pkgBuilds)
} }
@@ -531,7 +565,7 @@ func findPkgFiles(pkg *BuildPackage) {
func getDbPackage(pkg *BuildPackage) *ent.DbPackage { func getDbPackage(pkg *BuildPackage) *ent.DbPackage {
dbPkg, err := db.DbPackage.Query().Where(dbpackage.Pkgbase(pkg.Pkgbase)).Only(context.Background()) dbPkg, err := db.DbPackage.Query().Where(dbpackage.Pkgbase(pkg.Pkgbase)).Only(context.Background())
if err != nil { if err != nil {
dbPkg = db.DbPackage.Create().SetPkgbase(pkg.Pkgbase).SetMarch(pkg.March).SetPackages(packages2slice(pkg.Srcinfo.Packages)).SetRepository(dbpackage.Repository(pkg.Repo)).SaveX(context.Background()) dbPkg = db.DbPackage.Create().SetPkgbase(pkg.Pkgbase).SetMarch(pkg.March).SetPackages(packages2slice(pkg.Srcinfo.Packages)).SetRepository(pkg.Repo).SaveX(context.Background())
} }
return dbPkg return dbPkg
@@ -614,7 +648,7 @@ func isMirrorLatest(h *alpm.Handle, buildPkg *BuildPackage) (bool, alpm.IPackage
svn2gitVer, err := getSVN2GITVersion(&BuildPackage{ svn2gitVer, err := getSVN2GITVersion(&BuildPackage{
Pkgbase: pkg.Base(), Pkgbase: pkg.Base(),
}) }, h)
if err != nil { if err != nil {
return false, nil, "", err return false, nil, "", err
} }