Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Fri, 29 Jan 2016 22:55:45
Message-Id: 1454108090.56f34075aa214ca722ca6a8e6aed5fb306619e6f.vapier@gentoo
1 commit: 56f34075aa214ca722ca6a8e6aed5fb306619e6f
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 29 22:54:50 2016 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 29 22:54:50 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f34075
7
8 eutils.eclass: e{cvs,svn,git}_clean: make empty arg testing more correct
9
10 -z $* tests whether any args are non-empty, not whether any where
11 specified. Check $# instead for accurate results.
12
13 eclass/eutils.eclass | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16 diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
17 index 68c2813..d23a5b7 100644
18 --- a/eclass/eutils.eclass
19 +++ b/eclass/eutils.eclass
20 @@ -39,7 +39,7 @@ fi
21 # Remove CVS directories recursiveley. Useful when a source tarball contains
22 # internal CVS directories. Defaults to $PWD.
23 ecvs_clean() {
24 - [[ -z $* ]] && set -- .
25 + [[ $# -eq 0 ]] && set -- .
26 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
27 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
28 }
29 @@ -50,7 +50,7 @@ ecvs_clean() {
30 # Remove .svn directories recursiveley. Useful when a source tarball contains
31 # internal Subversion directories. Defaults to $PWD.
32 esvn_clean() {
33 - [[ -z $* ]] && set -- .
34 + [[ $# -eq 0 ]] && set -- .
35 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
36 }
37
38 @@ -60,7 +60,7 @@ esvn_clean() {
39 # Remove .git* directories/files recursiveley. Useful when a source tarball
40 # contains internal Git directories. Defaults to $PWD.
41 egit_clean() {
42 - [[ -z $* ]] && set -- .
43 + [[ $# -eq 0 ]] && set -- .
44 find "$@" -type d -name '.git*' -prune -print0 | xargs -0 rm -rf
45 }