| 1 |
commit: 76e219513367c692e7d46082ec5a6772e41edec0 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 7 06:46:30 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 16 23:25:04 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e21951 |
| 7 |
|
| 8 |
epatch.eclass: egrep -> grep -E |
| 9 |
|
| 10 |
Deprecated for a while but newer grep emits deprecation warnings. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/epatch.eclass | 6 +++--- |
| 15 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass |
| 18 |
index 5d18befe55b9..6a9c460da0a3 100644 |
| 19 |
--- a/eclass/epatch.eclass |
| 20 |
+++ b/eclass/epatch.eclass |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2021 Gentoo Authors |
| 23 |
+# Copyright 1999-2022 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
# @ECLASS: epatch.eclass |
| 27 |
@@ -285,13 +285,13 @@ epatch() { |
| 28 |
# people could (accidently) patch files in the root filesystem. |
| 29 |
# Or trigger other unpleasantries #237667. So disallow -p0 on |
| 30 |
# such patches. |
| 31 |
- local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }') |
| 32 |
+ local abs_paths=$(grep -E -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }') |
| 33 |
if [[ -n ${abs_paths} ]] ; then |
| 34 |
count=1 |
| 35 |
printf "NOTE: skipping -p0 due to absolute paths in patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}" |
| 36 |
fi |
| 37 |
# Similar reason, but with relative paths. |
| 38 |
- local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}") |
| 39 |
+ local rel_paths=$(grep -E -n '^[-+]{3} [^ ]*[.][.]/' "${PATCH_TARGET}") |
| 40 |
if [[ -n ${rel_paths} ]] ; then |
| 41 |
echo |
| 42 |
eerror "Rejected Patch: ${patchname}!" |
Archives