From 0e20e3cba0007dfff4b86c33ea81ff50d22a4524 Mon Sep 17 00:00:00 2001 From: Sergey Shatunov Date: Sun, 15 Mar 2020 03:30:27 +0700 Subject: [PATCH] Treat whole split-package as devel when pkgbase matches too Signed-off-by: Sergey Shatunov --- dep.go | 4 ++++ upgrade.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dep.go b/dep.go index 00833197..2ceb0a91 100644 --- a/dep.go +++ b/dep.go @@ -172,3 +172,7 @@ func isDevelName(name string) bool { return strings.Contains(name, "-always-") } + +func isDevelPackage(pkg alpm.Package) bool { + return isDevelName(pkg.Name()) || isDevelName(pkg.Base()) +} diff --git a/upgrade.go b/upgrade.go index c6379438..da3bfa58 100644 --- a/upgrade.go +++ b/upgrade.go @@ -286,7 +286,7 @@ func printLocalNewerThanAUR( left, right := getVersionDiff(pkg.Version(), aurPkg.Version) - if !isDevelName(pkg.Name()) && alpm.VerCmp(pkg.Version(), aurPkg.Version) > 0 { + if !isDevelPackage(pkg) && 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()),