sharpetronics/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-10-09 00:07:14 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84 from Morganamilo/fix#78

Browse Source 
Fix crash when package version is "invalid"
This commit is contained in:
J Guerreiro 2018-01-14 00:47:14 +09:00 committed by GitHub
commit ed6f05eb19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
upgrade.go
View File

@ -60,14 +60,9 @@ func (u upSlice) Less(i, j int) bool {
// Print prints the details of the packages to upgrade. // Print prints the details of the packages to upgrade.
func (u upSlice) Print(start int) { func (u upSlice) Print(start int) {
for k, i := range u { for k, i := range u {
old, err := pkgb.NewCompleteVersion(i.LocalVersion) old, errOld := pkgb.NewCompleteVersion(i.LocalVersion)
if err != nil { new, errNew := pkgb.NewCompleteVersion(i.RemoteVersion)
fmt.Println(i.Name, err) var left, right string
}
new, err := pkgb.NewCompleteVersion(i.RemoteVersion)
if err != nil {
fmt.Println(i.Name, err)
}
f := func(name string) (color int) { f := func(name string) (color int) {
var hash = 5381 var hash = 5381
@ -79,16 +74,18 @@ func (u upSlice) Print(start int) {
fmt.Printf("\x1b[33m%-2d\x1b[0m ", len(u)+start-k-1) fmt.Printf("\x1b[33m%-2d\x1b[0m ", len(u)+start-k-1)
fmt.Printf("\x1b[1;%dm%s\x1b[0m/\x1b[1;39m%-25s\t\t\x1b[0m", f(i.Repository), i.Repository, i.Name) fmt.Printf("\x1b[1;%dm%s\x1b[0m/\x1b[1;39m%-25s\t\t\x1b[0m", f(i.Repository), i.Repository, i.Name)
if old.Version != new.Version { if errOld != nil {
fmt.Printf("\x1b[31m%18s\x1b[0m-%s -> \x1b[1;32m%s\x1b[0m-%s\x1b[0m", left = fmt.Sprintf("\x1b[31m%20s\x1b[0m", "Invalid Version")
old.Version, old.Pkgrel,
new.Version, new.Pkgrel)
} else { } else {
fmt.Printf("\x1b[0m%18s-\x1b[31m%s\x1b[0m -> %s-\x1b[32m%s\x1b[0m", left = fmt.Sprintf("\x1b[31m%18s\x1b[0m-%s", old.Version, old.Pkgrel)
old.Version, old.Pkgrel,
new.Version, new.Pkgrel)
} }
print("\n")
if errNew != nil {
right = fmt.Sprintf("\x1b[31m%s\x1b[0m", "Invalid Version")
} else {
right = fmt.Sprintf("\x1b[31m%s\x1b[0m-%s", new.Version, new.Pkgrel)
}
fmt.Printf("%s -> %s\n", left, right)
} }
} }