system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-10-03 06:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move multierror to its own module

Browse source 
types is pretty generic as a module name, this should be split into
seperate modules.
This commit is contained in:
morganamilo 2019-10-16 22:38:54 +01:00
parent cff358d5d6
commit dacd77012c
No known key found for this signature in database
GPG key ID: 6FE9E7996B0B082E
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download.go
View file

@ -11,7 +11,7 @@ import (
"sync" "sync"
alpm "github.com/Jguer/go-alpm" alpm "github.com/Jguer/go-alpm"
"github.com/Jguer/yay/v9/pkg/types" "github.com/Jguer/yay/v9/pkg/multierror"
) )
const gitDiffRefName = "AUR_SEEN" const gitDiffRefName = "AUR_SEEN"
@ -265,7 +265,7 @@ func getPkgbuilds(pkgs []string) error {
func getPkgbuildsfromABS(pkgs []string, path string) (bool, error) { func getPkgbuildsfromABS(pkgs []string, path string) (bool, error) {
var wg sync.WaitGroup var wg sync.WaitGroup
var mux sync.Mutex var mux sync.Mutex
var errs types.MultiError var errs multierror.MultiError
names := make(map[string]string) names := make(map[string]string)
missing := make([]string, 0) missing := make([]string, 0)
downloaded := 0 downloaded := 0

8
install.go
View file

@ -12,8 +12,8 @@ import (
alpm "github.com/Jguer/go-alpm" alpm "github.com/Jguer/go-alpm"
"github.com/Jguer/yay/v9/pkg/completion" "github.com/Jguer/yay/v9/pkg/completion"
"github.com/Jguer/yay/v9/pkg/intrange" "github.com/Jguer/yay/v9/pkg/intrange"
"github.com/Jguer/yay/v9/pkg/multierror"
"github.com/Jguer/yay/v9/pkg/stringset" "github.com/Jguer/yay/v9/pkg/stringset"
"github.com/Jguer/yay/v9/pkg/types"
gosrc "github.com/Morganamilo/go-srcinfo" gosrc "github.com/Morganamilo/go-srcinfo"
) )
@ -718,7 +718,7 @@ func editDiffNumberMenu(bases []Base, installed stringset.StringSet, diff bool)
} }
func updatePkgbuildSeenRef(bases []Base, cloned stringset.StringSet) error { func updatePkgbuildSeenRef(bases []Base, cloned stringset.StringSet) error {
var errMulti types.MultiError var errMulti multierror.MultiError
for _, base := range bases { for _, base := range bases {
pkg := base.Pkgbase() pkg := base.Pkgbase()
dir := filepath.Join(config.BuildDir, pkg) dir := filepath.Join(config.BuildDir, pkg)
@ -733,7 +733,7 @@ func updatePkgbuildSeenRef(bases []Base, cloned stringset.StringSet) error {
} }
func showPkgbuildDiffs(bases []Base, cloned stringset.StringSet) error { func showPkgbuildDiffs(bases []Base, cloned stringset.StringSet) error {
var errMulti types.MultiError var errMulti multierror.MultiError
for _, base := range bases { for _, base := range bases {
pkg := base.Pkgbase() pkg := base.Pkgbase()
dir := filepath.Join(config.BuildDir, pkg) dir := filepath.Join(config.BuildDir, pkg)
@ -886,7 +886,7 @@ func downloadPkgbuilds(bases []Base, toSkip stringset.StringSet, buildDir string
downloaded := 0 downloaded := 0
var wg sync.WaitGroup var wg sync.WaitGroup
var mux sync.Mutex var mux sync.Mutex
var errs types.MultiError var errs multierror.MultiError
download := func(k int, base Base) { download := func(k int, base Base) {
defer wg.Done() defer wg.Done()

2
pkg/types/multierror.go → pkg/multierror/multierror.go
View file

@ -1,4 +1,4 @@
package types package multierror
import "sync" import "sync"

4
query.go
View file

@ -10,7 +10,7 @@ import (
alpm "github.com/Jguer/go-alpm" alpm "github.com/Jguer/go-alpm"
"github.com/Jguer/yay/v9/pkg/intrange" "github.com/Jguer/yay/v9/pkg/intrange"
"github.com/Jguer/yay/v9/pkg/types" "github.com/Jguer/yay/v9/pkg/multierror"
"github.com/Jguer/yay/v9/pkg/stringset" "github.com/Jguer/yay/v9/pkg/stringset"
rpc "github.com/mikkeloscar/aur" rpc "github.com/mikkeloscar/aur"
@ -503,7 +503,7 @@ func aurInfo(names []string, warnings *aurWarnings) ([]*rpc.Pkg, error) {
seen := make(map[string]int) seen := make(map[string]int)
var mux sync.Mutex var mux sync.Mutex
var wg sync.WaitGroup var wg sync.WaitGroup
var errs types.MultiError var errs multierror.MultiError
makeRequest := func(n, max int) { makeRequest := func(n, max int) {
defer wg.Done() defer wg.Done()

4
upgrade.go
View file

@ -9,8 +9,8 @@ import (
alpm "github.com/Jguer/go-alpm" alpm "github.com/Jguer/go-alpm"
"github.com/Jguer/yay/v9/pkg/intrange" "github.com/Jguer/yay/v9/pkg/intrange"
"github.com/Jguer/yay/v9/pkg/multierror"
"github.com/Jguer/yay/v9/pkg/stringset" "github.com/Jguer/yay/v9/pkg/stringset"
"github.com/Jguer/yay/v9/pkg/types"
rpc "github.com/mikkeloscar/aur" rpc "github.com/mikkeloscar/aur"
) )
@ -124,7 +124,7 @@ func upList(warnings *aurWarnings) (upSlice, upSlice, error) {
var repoUp upSlice var repoUp upSlice
var aurUp upSlice var aurUp upSlice
var errs types.MultiError var errs multierror.MultiError
aurdata := make(map[string]*rpc.Pkg) aurdata := make(map[string]*rpc.Pkg)