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: Thu, 26 Apr 2018 18:04:19
Message-Id: 1524765799.06387dc2f36ac77455bef31b3925fe3810e24482.zmedico@gentoo
1 commit: 06387dc2f36ac77455bef31b3925fe3810e24482
2 Author: Tomáš Chvátal <tomas.chvatal <AT> gmail <DOT> com>
3 AuthorDate: Thu Apr 26 18:03:19 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 26 18:03:19 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=06387dc2
7
8 etc-update: fix get_scan_regexp for arch OS_FAMILY
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 8b3604a4c..720bd83d3 100755
15 --- a/bin/etc-update
16 +++ b/bin/etc-update
17 @@ -62,7 +62,7 @@ elif [[ $OS_FAMILY == 'arch' ]]; then
18 printf -- '%s\n' "${1}.${NEW_EXT}"
19 }
20 get_scan_regexp() {
21 - echo "s:\(^.*/\)\(.*\)\(\.rpmnew\):\1\2\3$b\1$b\3$b\2:"
22 + echo "s:\(^.*/\)\(.*\)\(\.${NEW_EXT}\):\1\2\3$b\1$b\3$b\2:"
23 }
24 get_live_file() {
25 printf -- '%s\n' "${cfg_file%.${NEW_EXT}}"