mirror/yay
0
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2024-11-06 17:17:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1107 from Morganamilo/igorediffret

Browse Source 
Ignore errors while diffing
This commit is contained in:
J Guerreiro 2019-11-03 18:01:59 +00:00 committed by GitHub
commit bbc7cbba73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
install.go
View File

@ -249,7 +249,6 @@ func install(parser *arguments) (err error) {
} }
if len(toDiff) > 0 { if len(toDiff) > 0 {
// TODO: PKGBUILD diffs should not return in case of err. Just print and continue
err = showPkgbuildDiffs(toDiff, cloned) err = showPkgbuildDiffs(toDiff, cloned)
if err != nil { if err != nil {
return err return err
@ -765,11 +764,7 @@ func showPkgbuildDiffs(bases []Base, cloned stringset.StringSet) error {
} else { } else {
args = append(args, "--color=never") args = append(args, "--color=never")
} }
err = show(passToGit(dir, args...)) _ = show(passToGit(dir, args...))
if err != nil {
errMulti.Add(err)
continue
}
} else { } else {
args := []string{"diff"} args := []string{"diff"}
if useColor { if useColor {
@ -779,11 +774,7 @@ func showPkgbuildDiffs(bases []Base, cloned stringset.StringSet) error {
} }
args = append(args, "--no-index", "/var/empty", dir) args = append(args, "--no-index", "/var/empty", dir)
// git always returns 1. why? I have no idea // git always returns 1. why? I have no idea
err := show(passToGit(dir, args...)) _ = show(passToGit(dir, args...))
if err != nil {
errMulti.Add(err)
continue
}
} }
} }