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

fixed pacsift using system pacman.conf instead of chroot's

Browse Source
This commit is contained in:
Giovanni Harting
2023-10-13 19:41:10 +02:00
parent d83249c809
commit 0e4f0f04fa
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
proto_package.go
View File

@@ -446,14 +446,16 @@ func (p *ProtoPackage) isAvailable(h *alpm.Handle) bool {
buildManager.alpmMutex.Lock() buildManager.alpmMutex.Lock()
var pkg alpm.IPackage var pkg alpm.IPackage
if p.Srcinfo != nil { switch {
case p.Srcinfo != nil:
pkg, err = dbs.FindSatisfier(p.Srcinfo.Packages[0].Pkgname) pkg, err = dbs.FindSatisfier(p.Srcinfo.Packages[0].Pkgname)
} else if p.DBPackage != nil && len(p.DBPackage.Packages) > 0 { case p.DBPackage != nil && len(p.DBPackage.Packages) > 0:
pkg, err = dbs.FindSatisfier(p.DBPackage.Packages[0]) pkg, err = dbs.FindSatisfier(p.DBPackage.Packages[0])
} else { default:
cmd := exec.Command("unbuffer", "pacsift", "--exact", "--base="+p.Pkgbase, "--repo="+p.Repo.String()) //nolint:gosec cmd := exec.Command("unbuffer", "pacsift", "--exact", "--base="+p.Pkgbase, "--repo="+p.Repo.String(),
"--sysroot="+filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot))
var res []byte var res []byte
res, err = cmd.CombinedOutput() res, err = cmd.Output()
if err != nil { if err != nil {
log.Warningf("error getting packages from pacsift for %s: %v", p.Pkgbase, err) log.Warningf("error getting packages from pacsift for %s: %v", p.Pkgbase, err)
buildManager.alpmMutex.Unlock() buildManager.alpmMutex.Unlock()
@@ -462,7 +464,6 @@ func (p *ProtoPackage) isAvailable(h *alpm.Handle) bool {
buildManager.alpmMutex.Unlock() buildManager.alpmMutex.Unlock()
return false return false
} }
if len(strings.Split(strings.TrimSpace(string(res)), "\n")) > 0 { if len(strings.Split(strings.TrimSpace(string(res)), "\n")) > 0 {
pacsiftLines := strings.Split(strings.TrimSpace(string(res)), "\n") pacsiftLines := strings.Split(strings.TrimSpace(string(res)), "\n")