From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C5511382C5 for ; Mon, 30 Apr 2018 18:28:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8533E077A; Mon, 30 Apr 2018 18:28:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 94538E077A for ; Mon, 30 Apr 2018 18:28:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB137335C9B for ; Mon, 30 Apr 2018 18:28:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 520D126C for ; Mon, 30 Apr 2018 18:28:07 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1525112843.09fe2dbd14419f5619c5331f3525bf827269021c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/etc-update X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 09fe2dbd14419f5619c5331f3525bf827269021c X-VCS-Branch: master Date: Mon, 30 Apr 2018 18:28:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 27204097-db6a-4993-bd7b-61468ab8d575 X-Archives-Hash: b57c9a1dc8f1f7a8d7ac0fa208e47ce4 commit: 09fe2dbd14419f5619c5331f3525bf827269021c Author: Tomáš Chvátal gmail com> AuthorDate: Mon Apr 30 18:26:30 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Apr 30 18:27:23 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=09fe2dbd etc-update: fix rpm get_basename_find_opt for rpmnew bin/etc-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/etc-update b/bin/etc-update index 720bd83d3..4f02876ef 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -73,7 +73,7 @@ elif [[ $OS_FAMILY == 'rpm' ]]; then printf -- '%s\n' "${1}" |sed -e 's/\.rpmsave$//' -e 's/\.rpmnew$//' -e 's/\.rpmorig$//' } get_basename_find_opt() { - printf -- '%s\n' "${1}.rpm????" + printf -- '%s\n' "${1}.rpm???*" } get_scan_regexp() { echo "s:\(^.*/\)\(.*\)\(\.\(rpmnew|rpmsave|rpmorig\)\):\1\2\3$b\1$b\3$b\2:"