Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Mon, 30 Apr 2018 18:28:12
Message-Id: 1525112843.09fe2dbd14419f5619c5331f3525bf827269021c.zmedico@gentoo
1 commit: 09fe2dbd14419f5619c5331f3525bf827269021c
2 Author: Tomáš Chvátal <tomas.chvatal <AT> gmail <DOT> com>
3 AuthorDate: Mon Apr 30 18:26:30 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 30 18:27:23 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=09fe2dbd
7
8 etc-update: fix rpm get_basename_find_opt for rpmnew
9
10 bin/etc-update | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13 diff --git a/bin/etc-update b/bin/etc-update
14 index 720bd83d3..4f02876ef 100755
15 --- a/bin/etc-update
16 +++ b/bin/etc-update
17 @@ -73,7 +73,7 @@ elif [[ $OS_FAMILY == 'rpm' ]]; then
18 printf -- '%s\n' "${1}" |sed -e 's/\.rpmsave$//' -e 's/\.rpmnew$//' -e 's/\.rpmorig$//'
19 }
20 get_basename_find_opt() {
21 - printf -- '%s\n' "${1}.rpm????"
22 + printf -- '%s\n' "${1}.rpm???*"
23 }
24 get_scan_regexp() {
25 echo "s:\(^.*/\)\(.*\)\(\.\(rpmnew|rpmsave|rpmorig\)\):\1\2\3$b\1$b\3$b\2:"