system/yay
system/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay synced 2024-10-15 20:42:19 +00:00
Code Issues 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
parent 3fef09e650 3c996e5235
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 {
// TODO: PKGBUILD diffs should not return in case of err. Just print and continue
err = showPkgbuildDiffs(toDiff, cloned)
if err != nil {
return err
@ -765,11 +764,7 @@ func showPkgbuildDiffs(bases []Base, cloned stringset.StringSet) error {
} else {
args = append(args, "--color=never")
}
err = show(passToGit(dir, args...))
if err != nil {
errMulti.Add(err)
continue
}
_ = show(passToGit(dir, args...))
} else {
args := []string{"diff"}
if useColor {
@ -779,11 +774,7 @@ func showPkgbuildDiffs(bases []Base, cloned stringset.StringSet) error {
}
args = append(args, "--no-index", "/var/empty", dir)
// git always returns 1. why? I have no idea
err := show(passToGit(dir, args...))
if err != nil {
errMulti.Add(err)
continue
}
_ = show(passToGit(dir, args...))
}
}