Gentoo Archives: gentoo-dev

From: David Seifert <soap@g.o>
To: gentoo-dev@l.g.o
Cc: David Seifert <soap@g.o>
Subject: [gentoo-dev] [PATCH 09/12] vcs-clean.eclass: add missing die
Date: Sat, 29 Jan 2022 17:34:38
Message-Id: 20220129173130.2533280-9-soap@gentoo.org
In Reply to: [gentoo-dev] [PATCH 01/12] toolchain.eclass: remove EAPI 5 and 6 by David Seifert
1 Signed-off-by: David Seifert <soap@g.o>
2 ---
3 eclass/vcs-clean.eclass | 12 +++++++++---
4 1 file changed, 9 insertions(+), 3 deletions(-)
5
6 diff --git a/eclass/vcs-clean.eclass b/eclass/vcs-clean.eclass
7 index 991f680582f..e4c61ac7164 100644
8 --- a/eclass/vcs-clean.eclass
9 +++ b/eclass/vcs-clean.eclass
10 @@ -23,9 +23,11 @@ _VCS_CLEAN_ECLASS=1
11 # Remove CVS directories and .cvs* files recursively. Useful when a
12 # source tarball contains internal CVS directories. Defaults to ${PWD}.
13 ecvs_clean() {
14 + debug-print-function ${FUNCNAME} "${@}"
15 +
16 [[ $# -eq 0 ]] && set -- .
17 find "$@" '(' -type d -name 'CVS' -prune -o -type f -name '.cvs*' ')' \
18 - -exec rm -rf '{}' +
19 + -exec rm -rf '{}' + || die
20 }
21
22 # @FUNCTION: esvn_clean
23 @@ -34,8 +36,10 @@ ecvs_clean() {
24 # Remove .svn directories recursively. Useful when a source tarball
25 # contains internal Subversion directories. Defaults to ${PWD}.
26 esvn_clean() {
27 + debug-print-function ${FUNCNAME} "${@}"
28 +
29 [[ $# -eq 0 ]] && set -- .
30 - find "$@" -type d -name '.svn' -prune -exec rm -rf '{}' +
31 + find "$@" -type d -name '.svn' -prune -exec rm -rf '{}' + || die
32 }
33
34 # @FUNCTION: egit_clean
35 @@ -44,8 +48,10 @@ esvn_clean() {
36 # Remove .git* directories recursively. Useful when a source tarball
37 # contains internal Git directories. Defaults to ${PWD}.
38 egit_clean() {
39 + debug-print-function ${FUNCNAME} "${@}"
40 +
41 [[ $# -eq 0 ]] && set -- .
42 - find "$@" -type d -name '.git*' -prune -exec rm -rf '{}' +
43 + find "$@" -type d -name '.git*' -prune -exec rm -rf '{}' + || die
44 }
45
46 fi
47 --
48 2.35.0