mirror of
https://github.com/Jguer/yay
synced 2024-10-02 22:33:47 +00:00
fix(alpm): update alpm version
This commit is contained in:
parent
8a0a0cf2bc
commit
d6aa288ab8
2
cmd.go
2
cmd.go
|
@ -6,7 +6,7 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
alpm "github.com/Jguer/go-alpm"
|
"github.com/Jguer/go-alpm/v2"
|
||||||
"github.com/leonelquinteros/gotext"
|
"github.com/leonelquinteros/gotext"
|
||||||
|
|
||||||
"github.com/Jguer/yay/v10/pkg/completion"
|
"github.com/Jguer/yay/v10/pkg/completion"
|
||||||
|
|
4
go.mod
4
go.mod
|
@ -1,7 +1,7 @@
|
||||||
module github.com/Jguer/yay/v10
|
module github.com/Jguer/yay/v10
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/Jguer/go-alpm v0.0.0-20200405152916-a3feea4322e9
|
github.com/Jguer/go-alpm/v2 v2.0.1
|
||||||
github.com/Morganamilo/go-pacmanconf v0.0.0-20180910220353-9c5265e1b14f
|
github.com/Morganamilo/go-pacmanconf v0.0.0-20180910220353-9c5265e1b14f
|
||||||
github.com/Morganamilo/go-srcinfo v1.0.0
|
github.com/Morganamilo/go-srcinfo v1.0.0
|
||||||
github.com/bradleyjkemp/cupaloy v2.3.0+incompatible
|
github.com/bradleyjkemp/cupaloy v2.3.0+incompatible
|
||||||
|
@ -11,7 +11,7 @@ require (
|
||||||
github.com/pkg/errors v0.9.1
|
github.com/pkg/errors v0.9.1
|
||||||
github.com/stretchr/testify v1.6.1
|
github.com/stretchr/testify v1.6.1
|
||||||
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
|
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
|
||||||
golang.org/x/sys v0.0.0-20200820212457-1fb795427249
|
golang.org/x/sys v0.0.0-20200915084602-288bc346aa39
|
||||||
gopkg.in/h2non/gock.v1 v1.0.15
|
gopkg.in/h2non/gock.v1 v1.0.15
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
|
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
|
||||||
)
|
)
|
||||||
|
|
6
go.sum
6
go.sum
|
@ -1,5 +1,9 @@
|
||||||
github.com/Jguer/go-alpm v0.0.0-20200405152916-a3feea4322e9 h1:lLQSUe6iRdtFrP0zkDV7n8I8XKSxRHQTEU1KRh4IOLg=
|
github.com/Jguer/go-alpm v0.0.0-20200405152916-a3feea4322e9 h1:lLQSUe6iRdtFrP0zkDV7n8I8XKSxRHQTEU1KRh4IOLg=
|
||||||
github.com/Jguer/go-alpm v0.0.0-20200405152916-a3feea4322e9/go.mod h1:D5SUcIS9Yiz/L8cjRzq/992eERnx6ugYmGlc4e7xdus=
|
github.com/Jguer/go-alpm v0.0.0-20200405152916-a3feea4322e9/go.mod h1:D5SUcIS9Yiz/L8cjRzq/992eERnx6ugYmGlc4e7xdus=
|
||||||
|
github.com/Jguer/go-alpm/v2 v2.0.0 h1:K3o0mm+d9Vxi7cAKDJgftVzuu7aD2ciXNBCnY5u511Y=
|
||||||
|
github.com/Jguer/go-alpm/v2 v2.0.0/go.mod h1:zU4iKCtNkDARfj5BrKJXYAQ5nIjtZbySfa0paboSmTQ=
|
||||||
|
github.com/Jguer/go-alpm/v2 v2.0.1 h1:ySP1BkZXBpL5JCBipGSIyxjviQolxxvZhGAKWiBct6s=
|
||||||
|
github.com/Jguer/go-alpm/v2 v2.0.1/go.mod h1:zU4iKCtNkDARfj5BrKJXYAQ5nIjtZbySfa0paboSmTQ=
|
||||||
github.com/Morganamilo/go-pacmanconf v0.0.0-20180910220353-9c5265e1b14f h1:ptFKynTV1p8JCzqk81NcMj0DV0Xle+PdKxfHjPbdIOU=
|
github.com/Morganamilo/go-pacmanconf v0.0.0-20180910220353-9c5265e1b14f h1:ptFKynTV1p8JCzqk81NcMj0DV0Xle+PdKxfHjPbdIOU=
|
||||||
github.com/Morganamilo/go-pacmanconf v0.0.0-20180910220353-9c5265e1b14f/go.mod h1:Hk55m330jNiwxRodIlMCvw5iEyoRUCIY64W1p9D+tHc=
|
github.com/Morganamilo/go-pacmanconf v0.0.0-20180910220353-9c5265e1b14f/go.mod h1:Hk55m330jNiwxRodIlMCvw5iEyoRUCIY64W1p9D+tHc=
|
||||||
github.com/Morganamilo/go-srcinfo v1.0.0 h1:Wh4nEF+HJWo+29hnxM18Q2hi+DUf0GejS13+Wg+dzmI=
|
github.com/Morganamilo/go-srcinfo v1.0.0 h1:Wh4nEF+HJWo+29hnxM18Q2hi+DUf0GejS13+Wg+dzmI=
|
||||||
|
@ -34,6 +38,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5
|
||||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200820212457-1fb795427249 h1:tKP05IMsVLZ4VeeCEFmrIUmxAAx6UD8IBdPtYlYNa8g=
|
golang.org/x/sys v0.0.0-20200820212457-1fb795427249 h1:tKP05IMsVLZ4VeeCEFmrIUmxAAx6UD8IBdPtYlYNa8g=
|
||||||
golang.org/x/sys v0.0.0-20200820212457-1fb795427249/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200820212457-1fb795427249/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20200915084602-288bc346aa39 h1:356XA7ITklAU2//sYkjFeco+dH1bCRD8XCJ9FIEsvo4=
|
||||||
|
golang.org/x/sys v0.0.0-20200915084602-288bc346aa39/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
|
|
@ -10,7 +10,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
alpm "github.com/Jguer/go-alpm"
|
"github.com/Jguer/go-alpm/v2"
|
||||||
gosrc "github.com/Morganamilo/go-srcinfo"
|
gosrc "github.com/Morganamilo/go-srcinfo"
|
||||||
"github.com/leonelquinteros/gotext"
|
"github.com/leonelquinteros/gotext"
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ package db
|
||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
alpm "github.com/Jguer/go-alpm"
|
"github.com/Jguer/go-alpm/v2"
|
||||||
|
|
||||||
"github.com/Jguer/yay/v10/pkg/upgrade"
|
"github.com/Jguer/yay/v10/pkg/upgrade"
|
||||||
)
|
)
|
||||||
|
@ -11,7 +11,7 @@ import (
|
||||||
type RepoPackage interface {
|
type RepoPackage interface {
|
||||||
Base() string
|
Base() string
|
||||||
BuildDate() time.Time
|
BuildDate() time.Time
|
||||||
DB() *alpm.DB
|
DB() alpm.IDB
|
||||||
Description() string
|
Description() string
|
||||||
ISize() int64
|
ISize() int64
|
||||||
Name() string
|
Name() string
|
||||||
|
|
|
@ -8,7 +8,7 @@ import (
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
alpm "github.com/Jguer/go-alpm"
|
"github.com/Jguer/go-alpm/v2"
|
||||||
pacmanconf "github.com/Morganamilo/go-pacmanconf"
|
pacmanconf "github.com/Morganamilo/go-pacmanconf"
|
||||||
"github.com/leonelquinteros/gotext"
|
"github.com/leonelquinteros/gotext"
|
||||||
|
|
||||||
|
@ -20,8 +20,8 @@ import (
|
||||||
|
|
||||||
type AlpmExecutor struct {
|
type AlpmExecutor struct {
|
||||||
handle *alpm.Handle
|
handle *alpm.Handle
|
||||||
localDB *alpm.DB
|
localDB alpm.IDB
|
||||||
syncDB alpm.DBList
|
syncDB alpm.IDBList
|
||||||
conf *pacmanconf.Config
|
conf *pacmanconf.Config
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -171,7 +171,7 @@ func (ae *AlpmExecutor) questionCallback() func(question alpm.QuestionAny) {
|
||||||
|
|
||||||
size := 0
|
size := 0
|
||||||
|
|
||||||
_ = qp.Providers(ae.handle).ForEach(func(pkg alpm.Package) error {
|
_ = qp.Providers(ae.handle).ForEach(func(pkg alpm.IPackage) error {
|
||||||
size++
|
size++
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
@ -181,7 +181,7 @@ func (ae *AlpmExecutor) questionCallback() func(question alpm.QuestionAny) {
|
||||||
size = 1
|
size = 1
|
||||||
var dbName string
|
var dbName string
|
||||||
|
|
||||||
_ = qp.Providers(ae.handle).ForEach(func(pkg alpm.Package) error {
|
_ = qp.Providers(ae.handle).ForEach(func(pkg alpm.IPackage) error {
|
||||||
thisDB := pkg.DB().Name()
|
thisDB := pkg.DB().Name()
|
||||||
|
|
||||||
if dbName != thisDB {
|
if dbName != thisDB {
|
||||||
|
@ -298,8 +298,8 @@ func (ae *AlpmExecutor) SyncSatisfier(pkgName string) db.RepoPackage {
|
||||||
|
|
||||||
func (ae *AlpmExecutor) PackagesFromGroup(groupName string) []db.RepoPackage {
|
func (ae *AlpmExecutor) PackagesFromGroup(groupName string) []db.RepoPackage {
|
||||||
groupPackages := []db.RepoPackage{}
|
groupPackages := []db.RepoPackage{}
|
||||||
_ = ae.syncDB.FindGroupPkgs(groupName).ForEach(func(pkg alpm.Package) error {
|
_ = ae.syncDB.FindGroupPkgs(groupName).ForEach(func(pkg alpm.IPackage) error {
|
||||||
groupPackages = append(groupPackages, &pkg)
|
groupPackages = append(groupPackages, pkg)
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
return groupPackages
|
return groupPackages
|
||||||
|
@ -307,8 +307,8 @@ func (ae *AlpmExecutor) PackagesFromGroup(groupName string) []db.RepoPackage {
|
||||||
|
|
||||||
func (ae *AlpmExecutor) LocalPackages() []db.RepoPackage {
|
func (ae *AlpmExecutor) LocalPackages() []db.RepoPackage {
|
||||||
localPackages := []db.RepoPackage{}
|
localPackages := []db.RepoPackage{}
|
||||||
_ = ae.localDB.PkgCache().ForEach(func(pkg alpm.Package) error {
|
_ = ae.localDB.PkgCache().ForEach(func(pkg alpm.IPackage) error {
|
||||||
localPackages = append(localPackages, db.RepoPackage(&pkg))
|
localPackages = append(localPackages, db.RepoPackage(pkg))
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
return localPackages
|
return localPackages
|
||||||
|
@ -317,15 +317,15 @@ func (ae *AlpmExecutor) LocalPackages() []db.RepoPackage {
|
||||||
// SyncPackages searches SyncDB for packages or returns all packages if no search param is given
|
// SyncPackages searches SyncDB for packages or returns all packages if no search param is given
|
||||||
func (ae *AlpmExecutor) SyncPackages(pkgNames ...string) []db.RepoPackage {
|
func (ae *AlpmExecutor) SyncPackages(pkgNames ...string) []db.RepoPackage {
|
||||||
repoPackages := []db.RepoPackage{}
|
repoPackages := []db.RepoPackage{}
|
||||||
_ = ae.syncDB.ForEach(func(alpmDB alpm.DB) error {
|
_ = ae.syncDB.ForEach(func(alpmDB alpm.IDB) error {
|
||||||
if len(pkgNames) == 0 {
|
if len(pkgNames) == 0 {
|
||||||
_ = alpmDB.PkgCache().ForEach(func(pkg alpm.Package) error {
|
_ = alpmDB.PkgCache().ForEach(func(pkg alpm.IPackage) error {
|
||||||
repoPackages = append(repoPackages, db.RepoPackage(&pkg))
|
repoPackages = append(repoPackages, db.RepoPackage(pkg))
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
_ = alpmDB.Search(pkgNames).ForEach(func(pkg alpm.Package) error {
|
_ = alpmDB.Search(pkgNames).ForEach(func(pkg alpm.IPackage) error {
|
||||||
repoPackages = append(repoPackages, db.RepoPackage(&pkg))
|
repoPackages = append(repoPackages, db.RepoPackage(pkg))
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -402,7 +402,7 @@ func (ae *AlpmExecutor) RepoUpgrades(enableDowngrade bool) (upgrade.UpSlice, err
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return slice, err
|
return slice, err
|
||||||
}
|
}
|
||||||
_ = ae.handle.TransGetAdd().ForEach(func(pkg alpm.Package) error {
|
_ = ae.handle.TransGetAdd().ForEach(func(pkg alpm.IPackage) error {
|
||||||
localVer := "-"
|
localVer := "-"
|
||||||
|
|
||||||
if localPkg := localDB.Pkg(pkg.Name()); localPkg != nil {
|
if localPkg := localDB.Pkg(pkg.Name()); localPkg != nil {
|
||||||
|
@ -427,8 +427,8 @@ func (ae *AlpmExecutor) AlpmArch() (string, error) {
|
||||||
|
|
||||||
func (ae *AlpmExecutor) BiggestPackages() []db.RepoPackage {
|
func (ae *AlpmExecutor) BiggestPackages() []db.RepoPackage {
|
||||||
localPackages := []db.RepoPackage{}
|
localPackages := []db.RepoPackage{}
|
||||||
_ = ae.localDB.PkgCache().SortBySize().ForEach(func(pkg alpm.Package) error {
|
_ = ae.localDB.PkgCache().SortBySize().ForEach(func(pkg alpm.IPackage) error {
|
||||||
localPackages = append(localPackages, db.RepoPackage(&pkg))
|
localPackages = append(localPackages, db.RepoPackage(pkg))
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
return localPackages
|
return localPackages
|
||||||
|
@ -436,8 +436,8 @@ func (ae *AlpmExecutor) BiggestPackages() []db.RepoPackage {
|
||||||
|
|
||||||
func (ae *AlpmExecutor) LastBuildTime() time.Time {
|
func (ae *AlpmExecutor) LastBuildTime() time.Time {
|
||||||
var lastTime time.Time
|
var lastTime time.Time
|
||||||
_ = ae.syncDB.ForEach(func(db alpm.DB) error {
|
_ = ae.syncDB.ForEach(func(db alpm.IDB) error {
|
||||||
_ = db.PkgCache().ForEach(func(pkg alpm.Package) error {
|
_ = db.PkgCache().ForEach(func(pkg alpm.IPackage) error {
|
||||||
thisTime := pkg.BuildDate()
|
thisTime := pkg.BuildDate()
|
||||||
if thisTime.After(lastTime) {
|
if thisTime.After(lastTime) {
|
||||||
lastTime = thisTime
|
lastTime = thisTime
|
||||||
|
|
|
@ -3,13 +3,13 @@ package mock
|
||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/Jguer/go-alpm"
|
"github.com/Jguer/go-alpm/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Package struct {
|
type Package struct {
|
||||||
PBase string
|
PBase string
|
||||||
PBuildDate time.Time
|
PBuildDate time.Time
|
||||||
PDB *alpm.DB
|
PDB alpm.IDB
|
||||||
PDescription string
|
PDescription string
|
||||||
PISize int64
|
PISize int64
|
||||||
PName string
|
PName string
|
||||||
|
@ -27,7 +27,7 @@ func (p *Package) BuildDate() time.Time {
|
||||||
return p.PBuildDate
|
return p.PBuildDate
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Package) DB() *alpm.DB {
|
func (p *Package) DB() alpm.IDB {
|
||||||
return p.PDB
|
return p.PDB
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ package dep
|
||||||
import (
|
import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
alpm "github.com/Jguer/go-alpm"
|
"github.com/Jguer/go-alpm/v2"
|
||||||
rpc "github.com/mikkeloscar/aur"
|
rpc "github.com/mikkeloscar/aur"
|
||||||
|
|
||||||
"github.com/Jguer/yay/v10/pkg/db"
|
"github.com/Jguer/yay/v10/pkg/db"
|
||||||
|
|
2
query.go
2
query.go
|
@ -7,7 +7,7 @@ import (
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
alpm "github.com/Jguer/go-alpm"
|
"github.com/Jguer/go-alpm/v2"
|
||||||
"github.com/leonelquinteros/gotext"
|
"github.com/leonelquinteros/gotext"
|
||||||
rpc "github.com/mikkeloscar/aur"
|
rpc "github.com/mikkeloscar/aur"
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
alpm "github.com/Jguer/go-alpm"
|
"github.com/Jguer/go-alpm/v2"
|
||||||
"github.com/leonelquinteros/gotext"
|
"github.com/leonelquinteros/gotext"
|
||||||
|
|
||||||
"github.com/Jguer/yay/v10/pkg/db"
|
"github.com/Jguer/yay/v10/pkg/db"
|
||||||
|
|
Loading…
Reference in a new issue