diff --git a/go.mod b/go.mod index 80fd6881..ed029794 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/Jguer/yay/v10 require ( github.com/Jguer/go-alpm v0.0.0-20200405152916-a3feea4322e9 // indirect - github.com/Jguer/go-alpm/v2 v2.0.3-0.20210503120603-1e8b5ec6f821 + github.com/Jguer/go-alpm/v2 v2.0.5 github.com/Morganamilo/go-pacmanconf v0.0.0-20210502114700-cff030e927a5 github.com/Morganamilo/go-srcinfo v1.0.0 github.com/bradleyjkemp/cupaloy v2.3.0+incompatible diff --git a/go.sum b/go.sum index 784c9bf6..6816f9bc 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ 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/v2 v2.0.3-0.20210503120603-1e8b5ec6f821 h1:ds4SK2NSSFF3f/jOUL7liQ2N6Ug7UQzFdAvWcj44Y2s= -github.com/Jguer/go-alpm/v2 v2.0.3-0.20210503120603-1e8b5ec6f821/go.mod h1:zU4iKCtNkDARfj5BrKJXYAQ5nIjtZbySfa0paboSmTQ= +github.com/Jguer/go-alpm/v2 v2.0.5 h1:1TZxkvCIfTOhjhxGy/Z1FNSeuY9DXBKF5qxUoj0IZ0A= +github.com/Jguer/go-alpm/v2 v2.0.5/go.mod h1:zU4iKCtNkDARfj5BrKJXYAQ5nIjtZbySfa0paboSmTQ= github.com/Morganamilo/go-pacmanconf v0.0.0-20210502114700-cff030e927a5 h1:TMscPjkb1ThXN32LuFY5bEYIcXZx3YlwzhS1GxNpn/c= github.com/Morganamilo/go-pacmanconf v0.0.0-20210502114700-cff030e927a5/go.mod h1:Hk55m330jNiwxRodIlMCvw5iEyoRUCIY64W1p9D+tHc= github.com/Morganamilo/go-srcinfo v1.0.0 h1:Wh4nEF+HJWo+29hnxM18Q2hi+DUf0GejS13+Wg+dzmI= diff --git a/pkg/db/ialpm/alpm.go b/pkg/db/ialpm/alpm.go index ff6ad6ad..36f39c66 100644 --- a/pkg/db/ialpm/alpm.go +++ b/pkg/db/ialpm/alpm.go @@ -254,8 +254,8 @@ func (ae *AlpmExecutor) RefreshHandle() error { return errConf } - alpmHandle.SetQuestionCallback(ae.questionCallback()) - alpmHandle.SetLogCallback(logCallback) + alpmSetQuestionCallback(alpmHandle, ae.questionCallback()) + alpmSetLogCallback(alpmHandle, logCallback) ae.handle = alpmHandle ae.syncDBsCache = nil ae.syncDB, err = alpmHandle.SyncDBs() diff --git a/pkg/db/ialpm/alpm_five.go b/pkg/db/ialpm/alpm_five.go index b8d9a6dc..d2107800 100644 --- a/pkg/db/ialpm/alpm_five.go +++ b/pkg/db/ialpm/alpm_five.go @@ -15,3 +15,11 @@ func (ae *AlpmExecutor) AlpmArchitectures() ([]string, error) { return []string{arch}, err } + +func alpmSetLogCallback(alpmHandle *alpm.Handle, cb func(alpm.LogLevel, string)) { + alpmHandle.SetLogCallback(cb) +} + +func alpmSetQuestionCallback(alpmHandle *alpm.Handle, cb func(alpm.QuestionAny)) { + alpmHandle.SetQuestionCallback(cb) +} diff --git a/pkg/db/ialpm/alpm_six.go b/pkg/db/ialpm/alpm_six.go index 570d2d25..aa0bfbdd 100644 --- a/pkg/db/ialpm/alpm_six.go +++ b/pkg/db/ialpm/alpm_six.go @@ -15,3 +15,17 @@ func (ae *AlpmExecutor) AlpmArchitectures() ([]string, error) { return architectures.Slice(), err } + +func alpmSetLogCallback(alpmHandle *alpm.Handle, cb func(alpm.LogLevel, string)) { + alpmHandle.SetLogCallback(func(ctx interface{}, lvl alpm.LogLevel, msg string) { + cb := ctx.(func(alpm.LogLevel, string)) + cb(lvl, msg) + }, cb) +} + +func alpmSetQuestionCallback(alpmHandle *alpm.Handle, cb func(alpm.QuestionAny)) { + alpmHandle.SetQuestionCallback(func(ctx interface{}, q alpm.QuestionAny) { + cb := ctx.(func(alpm.QuestionAny)) + cb(q) + }, cb) +}