From 5c01e9afc99b81020fe98352ba5612b8096cf3a5 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Fri, 13 Oct 2023 21:04:06 +0200 Subject: [PATCH] replace warnings even if no newline is found --- proto_package.go | 2 +- utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proto_package.go b/proto_package.go index 40bf769..d227eef 100644 --- a/proto_package.go +++ b/proto_package.go @@ -454,7 +454,7 @@ func (p *ProtoPackage) isAvailable(h *alpm.Handle) bool { case p.DBPackage != nil && len(p.DBPackage.Packages) > 0: pkg, err = dbs.FindSatisfier(p.DBPackage.Packages[0]) default: - cmd := exec.Command("unbuffer", "pacsift", "--exact", "--base="+p.Pkgbase, "--repo="+p.Repo.String(), + cmd := exec.Command("unbuffer", "pacsift", "--exact", "--base="+p.Pkgbase, "--repo="+p.Repo.String(), //nolint:gosec "--sysroot="+filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot)) var res []byte res, err = cmd.Output() diff --git a/utils.go b/utils.go index f612d00..602b0f0 100644 --- a/utils.go +++ b/utils.go @@ -51,7 +51,7 @@ var ( reReplaceSpecialChars = regexp.MustCompile(`(?m)[^a-zA-Z0-9_\-.]`) reReplaceUnderscore = regexp.MustCompile(`(?m)[_\-]{2,}`) reReplaceTree = regexp.MustCompile(`(?m)^tree$`) - reReplacePacsiftWarning = regexp.MustCompile(`(?m)^warning:.*\n`) + reReplacePacsiftWarning = regexp.MustCompile(`(?m)^warning:.*\n*`) ) type Conf struct {