diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-01-06 16:06:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-01-06 16:06:35 +0000 |
| commit | db5458ce6699d79de8b0dd05d2ba9d01a6ad1b44 (patch) | |
| tree | 9a647a22d727b592216c6b3a5b8019d1fe7bd6b0 /bin/ebuild-helpers | |
| parent | In python-2.x, convert PortageException.value attribute from unicode to str (diff) | |
| download | portage-idfetch-db5458ce6699d79de8b0dd05d2ba9d01a6ad1b44.tar.gz portage-idfetch-db5458ce6699d79de8b0dd05d2ba9d01a6ad1b44.tar.bz2 portage-idfetch-db5458ce6699d79de8b0dd05d2ba9d01a6ad1b44.zip | |
Fix it so an empty directory given to doins -r does not trigger failure.
svn path=/main/trunk/; revision=15172
Diffstat (limited to 'bin/ebuild-helpers')
| -rwxr-xr-x | bin/ebuild-helpers/doins | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins index cf464477..db19750e 100755 --- a/bin/ebuild-helpers/doins +++ b/bin/ebuild-helpers/doins @@ -63,16 +63,12 @@ _doins() { } _xdoins() { - local -i success=0 failed=0 + local -i failed=0 while read -d $'\0' x ; do _doins "$x" "${x%/*}" - if [[ $? -eq 0 ]] ; then - ((success|=1)) - else - ((failed|=1)) - fi + ((failed|=$?)) done - [[ $failed -ne 0 || $success -eq 0 ]] && return 1 || return 0 + return $failed } success=0 @@ -109,6 +105,9 @@ for x in "$@" ; do find "$x_orig" -type d -exec dodir "${INSDESTTREE}/{}" \; find "$x_orig" \( -type f -or -type l \) -print0 | _xdoins if [[ ${PIPESTATUS[1]} -eq 0 ]] ; then + # NOTE: Even if only an empty directory is installed here, it + # still counts as success, since an empty directory given as + # an argument to doins -r should not trigger failure. ((success|=1)) else ((failed|=1)) |