system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-07-24 03:34:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PkgbuildDiffs use MultiError now to accumulate errors instead of breaking execution at any error

Browse source
This commit is contained in:
Jguer 2019-10-13 23:23:55 +01:00
parent 29b051134a
commit c180fa8d19
No known key found for this signature in database
GPG key ID: 6D6CC9BEA8556B35
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
install.go
View file

@ -215,6 +215,7 @@ func install(parser *arguments) (err error) {
}
if len(toDiff) > 0 {
// TODO: PKGBUILD diffs should not return in case of err. Just print and continue
err = showPkgbuildDiffs(toDiff, cloned)
if err != nil {
return err
@ -231,7 +232,7 @@ func install(parser *arguments) (err error) {
}
err = updatePkgbuildSeenRef(toDiff, cloned)
if err != nil {
return err
fmt.Fprintln(os.Stderr, err.Error())
}
config.NoConfirm = oldValue
@ -698,27 +699,30 @@ func editDiffNumberMenu(bases []Base, installed types.StringSet, diff bool) ([]B
}
func updatePkgbuildSeenRef(bases []Base, cloned types.StringSet) error {
var errMulti types.MultiError
for _, base := range bases {
pkg := base.Pkgbase()
dir := filepath.Join(config.BuildDir, pkg)
if shouldUseGit(dir) {
err := gitUpdateSeenRef(config.BuildDir, pkg)
if err != nil {
return err
errMulti.Add(err)
}
}
}
return nil
return errMulti.Return()
}
func showPkgbuildDiffs(bases []Base, cloned types.StringSet) error {
var errMulti types.MultiError
for _, base := range bases {
pkg := base.Pkgbase()
dir := filepath.Join(config.BuildDir, pkg)
if shouldUseGit(dir) {
start, err := getLastSeenHash(config.BuildDir, pkg)
if err != nil {
return err
errMulti.Add(err)
continue
}
if cloned.Get(pkg) {
@ -726,7 +730,8 @@ func showPkgbuildDiffs(bases []Base, cloned types.StringSet) error {
} else {
hasDiff, err := gitHasDiff(config.BuildDir, pkg)
if err != nil {
return err
errMulti.Add(err)
continue
}
if !hasDiff {
@ -743,7 +748,8 @@ func showPkgbuildDiffs(bases []Base, cloned types.StringSet) error {
}
err = show(passToGit(dir, args...))
if err != nil {
return err
errMulti.Add(err)
continue
}
} else {
args := []string{"diff"}
@ -756,12 +762,13 @@ func showPkgbuildDiffs(bases []Base, cloned types.StringSet) error {
// git always returns 1. why? I have no idea
err := show(passToGit(dir, args...))
if err != nil {
return err
errMulti.Add(err)
continue
}
}
}
return nil
return errMulti.Return()
}
func editPkgbuilds(bases []Base, srcinfos map[string]*gosrc.Srcinfo) error {