From dfe7738d6e873a84b82472dbbea526abc641445f Mon Sep 17 00:00:00 2001 From: morganamilo Date: Tue, 31 Jul 2018 00:19:21 +0100 Subject: [PATCH] Use pacman like text for ignorepkg and newerpkg Now that we are using alpm to fetch packages it generates these mesages and we can not control the format. So change out format to match. --- upgrade.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/upgrade.go b/upgrade.go index 5e81ccaf..39d1e448 100644 --- a/upgrade.go +++ b/upgrade.go @@ -268,10 +268,11 @@ func upAUR( func printIgnoringPackage(pkg alpm.Package, newPkgVersion string) { left, right := getVersionDiff(pkg.Version(), newPkgVersion) - fmt.Println( - yellow(bold(smallArrow)) + fmt.Sprintf( - " Ignoring package upgrade: %s (%s -> %s)", - cyan(pkg.Name()), left, right)) + fmt.Printf("%s %s: ignoring package upgrade (%s => %s)\n", + yellow(bold(smallArrow)), + cyan(pkg.Name()), + left, right, + ) } func printLocalNewerThanAUR( @@ -284,12 +285,12 @@ func printLocalNewerThanAUR( left, right := getVersionDiff(pkg.Version(), aurPkg.Version) - if !isDevelName(pkg.Name()) && - alpm.VerCmp(pkg.Version(), aurPkg.Version) > 0 { - fmt.Println( - yellow(bold(smallArrow)) + fmt.Sprintf( - " Local package is newer than AUR: %s (%s -> %s)", - cyan(pkg.Name()), left, right)) + if !isDevelName(pkg.Name()) && alpm.VerCmp(pkg.Version(), aurPkg.Version) > 0 { + fmt.Printf("%s %s: local (%s) is newer than AUR (%s)\n", + yellow(bold(smallArrow)), + cyan(pkg.Name()), + left, right, + ) } } }