sharpetronics/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-12-09 00:03:52 -05:00
Code Issues Projects Releases Wiki Activity

Calculate makeDeps properly

Browse Source 
MakeOnly would be set to true when moving from normal deps to make deps
But would incorrectly stay set to true when moving to the deps of the
following packages.

depOrder.Aur now only holds one package from each base like
depCatagories does.
This commit is contained in:
morganamilo 2018-05-08 19:42:19 +01:00
parent c019a2cc02
commit 671f836ec5
No known key found for this signature in database
GPG Key ID: 6FE9E7996B0B082E
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dep.go
View File

@ -126,4 +126,3 @@ func getBases(pkgs map[string]*rpc.Pkg) map[string][]*rpc.Pkg {
return bases return bases
} }

36
depOrder.go
View File

@ -78,7 +78,7 @@ func getDepOrder(dp *depPool) *depOrder {
} }
} }
do.getBases() //do.getBases()
return do return do
} }
@ -87,22 +87,25 @@ func (do *depOrder) orderPkgAur(pkg *rpc.Pkg, dp *depPool, runtime bool) {
if runtime { if runtime {
do.Runtime.set(pkg.Name) do.Runtime.set(pkg.Name)
} }
do.Aur = append(do.Aur, pkg) if _, ok := do.Bases[pkg.PackageBase]; !ok {
do.Aur = append(do.Aur, pkg)
do.Bases[pkg.PackageBase] = make([]*rpc.Pkg, 0)
}
do.Bases[pkg.PackageBase] = append(do.Bases[pkg.PackageBase], pkg)
delete(dp.Aur, pkg.Name) delete(dp.Aur, pkg.Name)
for _, deps := range [3][]string{pkg.Depends, pkg.MakeDepends, pkg.CheckDepends} { for i, deps := range [3][]string{pkg.Depends, pkg.MakeDepends, pkg.CheckDepends} {
for _, dep := range deps { for _, dep := range deps {
aurPkg := dp.findSatisfierAur(dep) aurPkg := dp.findSatisfierAur(dep)
if aurPkg != nil { if aurPkg != nil {
do.orderPkgAur(aurPkg, dp, runtime) do.orderPkgAur(aurPkg, dp, runtime && i == 0)
} }
repoPkg := dp.findSatisfierRepo(dep) repoPkg := dp.findSatisfierRepo(dep)
if repoPkg != nil { if repoPkg != nil {
do.orderPkgRepo(repoPkg, dp, runtime) do.orderPkgRepo(repoPkg, dp, runtime && i == 0)
} }
runtime = false
} }
} }
} }
@ -135,18 +138,29 @@ func (do *depOrder) getBases() {
} }
func (do *depOrder) HasMake() bool { func (do *depOrder) HasMake() bool {
return len(do.Runtime) != len(do.Aur)+len(do.Repo) lenAur := 0
for _, base := range do.Bases {
lenAur += len(base)
}
return len(do.Runtime) != lenAur+len(do.Repo)
} }
func (do *depOrder) getMake() []string { func (do *depOrder) getMake() []string {
makeOnly := make([]string, 0, len(do.Aur)+len(do.Repo)-len(do.Runtime)) makeOnly := make([]string, 0, len(do.Aur)+len(do.Repo)-len(do.Runtime))
for _, pkg := range do.Aur { for _, base := range do.Bases {
makeOnly = append(makeOnly, pkg.Name) for _, pkg := range base {
if !do.Runtime.get(pkg.Name) {
makeOnly = append(makeOnly, pkg.Name)
}
}
} }
for _, pkg := range do.Repo { for _, pkg := range do.Repo {
makeOnly = append(makeOnly, pkg.Name()) if !do.Runtime.get(pkg.Name()) {
makeOnly = append(makeOnly, pkg.Name())
}
} }
return makeOnly return makeOnly

6
install.go
View File

@ -249,11 +249,7 @@ func install(parser *arguments) error {
return err return err
} }
if do.HasMake() { if removeMake {
if !removeMake {
return nil
}
removeArguments := makeArguments() removeArguments := makeArguments()
removeArguments.addArg("R", "u") removeArguments.addArg("R", "u")