system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-10-31 04:12:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure devel packages exist when updating

Browse source
This commit is contained in:
morganamilo 2018-07-31 16:58:49 +01:00
parent 892d9cc752
commit 95bcea8f40
No known key found for this signature in database
GPG key ID: 6FE9E7996B0B082E
1 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
upgrade.go
View file

@ -121,7 +121,7 @@ func upList(warnings *aurWarnings) (aurUp upSlice, repoUp upSlice, err error) {
var repoErr error var repoErr error
var aurErr error var aurErr error
pkgdata := make(map[string]*rpc.Pkg) aurdata := make(map[string]*rpc.Pkg)
if mode == ModeAny || mode == ModeRepo { if mode == ModeAny || mode == ModeRepo {
fmt.Println(bold(cyan("::") + bold(" Searching databases for updates..."))) fmt.Println(bold(cyan("::") + bold(" Searching databases for updates...")))
@ -134,9 +134,17 @@ func upList(warnings *aurWarnings) (aurUp upSlice, repoUp upSlice, err error) {
if mode == ModeAny || mode == ModeAUR { if mode == ModeAny || mode == ModeAUR {
fmt.Println(bold(cyan("::") + bold(" Searching AUR for updates..."))) fmt.Println(bold(cyan("::") + bold(" Searching AUR for updates...")))
var _aurdata []*rpc.Pkg
_aurdata, aurErr = aurInfo(remoteNames, warnings)
if aurErr == nil {
for _, pkg := range _aurdata {
aurdata[pkg.Name] = pkg
}
wg.Add(1) wg.Add(1)
go func() { go func() {
aurUp, aurErr = upAUR(remote, remoteNames, pkgdata, warnings) aurUp, aurErr = upAUR(remote, aurdata)
wg.Done() wg.Done()
}() }()
@ -144,15 +152,16 @@ func upList(warnings *aurWarnings) (aurUp upSlice, repoUp upSlice, err error) {
fmt.Println(bold(cyan("::") + bold(" Checking development packages..."))) fmt.Println(bold(cyan("::") + bold(" Checking development packages...")))
wg.Add(1) wg.Add(1)
go func() { go func() {
develUp = upDevel(remote) develUp = upDevel(remote, aurdata)
wg.Done() wg.Done()
}() }()
} }
} }
}
wg.Wait() wg.Wait()
printLocalNewerThanAUR(remote, pkgdata) printLocalNewerThanAUR(remote, aurdata)
errs := make([]string, 0) errs := make([]string, 0)
for _, e := range []error{repoErr, aurErr} { for _, e := range []error{repoErr, aurErr} {
@ -183,7 +192,7 @@ func upList(warnings *aurWarnings) (aurUp upSlice, repoUp upSlice, err error) {
return aurUp, repoUp, err return aurUp, repoUp, err
} }
func upDevel(remote []alpm.Package) (toUpgrade upSlice) { func upDevel(remote []alpm.Package, aurdata map[string]*rpc.Pkg) (toUpgrade upSlice) {
toUpdate := make([]alpm.Package, 0) toUpdate := make([]alpm.Package, 0)
toRemove := make([]string, 0) toRemove := make([]string, 0)
@ -195,6 +204,7 @@ func upDevel(remote []alpm.Package) (toUpgrade upSlice) {
defer wg.Done() defer wg.Done()
if e.needsUpdate() { if e.needsUpdate() {
if _, ok := aurdata[vcsName]; ok {
for _, pkg := range remote { for _, pkg := range remote {
if pkg.Name() == vcsName { if pkg.Name() == vcsName {
mux1.Lock() mux1.Lock()
@ -203,6 +213,7 @@ func upDevel(remote []alpm.Package) (toUpgrade upSlice) {
return return
} }
} }
}
mux2.Lock() mux2.Lock()
toRemove = append(toRemove, vcsName) toRemove = append(toRemove, vcsName)
@ -231,22 +242,11 @@ func upDevel(remote []alpm.Package) (toUpgrade upSlice) {
// upAUR gathers foreign packages and checks if they have new versions. // upAUR gathers foreign packages and checks if they have new versions.
// Output: Upgrade type package list. // Output: Upgrade type package list.
func upAUR( func upAUR(remote []alpm.Package, aurdata map[string]*rpc.Pkg) (upSlice, error) {
remote []alpm.Package, remoteNames []string,
pkgdata map[string]*rpc.Pkg, warnings *aurWarnings) (upSlice, error) {
toUpgrade := make(upSlice, 0) toUpgrade := make(upSlice, 0)
_pkgdata, err := aurInfo(remoteNames, warnings)
if err != nil {
return nil, err
}
for _, pkg := range _pkgdata {
pkgdata[pkg.Name] = pkg
}
for _, pkg := range remote { for _, pkg := range remote {
aurPkg, ok := pkgdata[pkg.Name()] aurPkg, ok := aurdata[pkg.Name()]
if !ok { if !ok {
continue continue
} }
@ -274,9 +274,9 @@ func printIgnoringPackage(pkg alpm.Package, newPkgVersion string) {
} }
func printLocalNewerThanAUR( func printLocalNewerThanAUR(
remote []alpm.Package, pkgdata map[string]*rpc.Pkg) { remote []alpm.Package, aurdata map[string]*rpc.Pkg) {
for _, pkg := range remote { for _, pkg := range remote {
aurPkg, ok := pkgdata[pkg.Name()] aurPkg, ok := aurdata[pkg.Name()]
if !ok { if !ok {
continue continue
} }