commit: 09fe2dbd14419f5619c5331f3525bf827269021c
Author: Tomáš Chvátal <tomas.chvatal <AT> gmail <DOT> com>
AuthorDate: Mon Apr 30 18:26:30 2018 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> 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:"