[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

[Robin H. Johnson]

commit:     d2f244bff1b9d0a3dc32f8e4f1b175f664b92592
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 21 05:08:08 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 21 05:08:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f244bf

dev-vcs/git: improve perl packlist cleanup

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Package-Manager: Portage-2.3.33, Repoman-2.3.9

 dev-vcs/git/git-2.16.1.ebuild  | 5 +++--
 dev-vcs/git/git-2.16.3.ebuild  | 5 +++--
 dev-vcs/git/git-2.17.0.ebuild  | 6 +++---
 dev-vcs/git/git-9999-r1.ebuild | 6 +++---
 dev-vcs/git/git-9999-r2.ebuild | 6 +++---
 dev-vcs/git/git-9999-r3.ebuild | 6 +++---
 dev-vcs/git/git-9999.ebuild    | 6 +++---
 7 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/dev-vcs/git/git-2.16.1.ebuild b/dev-vcs/git/git-2.16.1.ebuild
index ef8239e6b0d..e675a47660d 100644
--- a/dev-vcs/git/git-2.16.1.ebuild
+++ b/dev-vcs/git/git-2.16.1.ebuild
@@ -535,9 +535,10 @@ src_install() {
                newdoc  "${S}"/gitweb/README README.gitweb
 
                for d in "${ED}"/usr/lib{64,}/perl5/ ; do
-                       test -d "$d" && find "$d" \
+                       if test -d "$d" ; then find "$d" \
                                -name .packlist \
-                               -delete
+                               -delete || die
+                       fi
                done
        else
                rm -rf "${ED}"/usr/share/gitweb

diff --git a/dev-vcs/git/git-2.16.3.ebuild b/dev-vcs/git/git-2.16.3.ebuild
index b1eec131970..d0faf8d3a1f 100644
--- a/dev-vcs/git/git-2.16.3.ebuild
+++ b/dev-vcs/git/git-2.16.3.ebuild
@@ -535,9 +535,10 @@ src_install() {
                newdoc  "${S}"/gitweb/README README.gitweb
 
                for d in "${ED}"/usr/lib{64,}/perl5/ ; do
-                       test -d "$d" && find "$d" \
+                       if test -d "$d" ; then find "$d" \
                                -name .packlist \
-                               -delete
+                               -delete || die
+                       fi
                done
        else
                rm -rf "${ED}"/usr/share/gitweb

diff --git a/dev-vcs/git/git-2.17.0.ebuild b/dev-vcs/git/git-2.17.0.ebuild
index ec767a414c4..5f55ce0d640 100644
--- a/dev-vcs/git/git-2.17.0.ebuild
+++ b/dev-vcs/git/git-2.17.0.ebuild
@@ -544,10 +544,10 @@ src_install() {
                newdoc  "${S}"/gitweb/README README.gitweb
 
                for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
-                       test -d "$d" && find "${d}" \
+                       if test -d "$d" ; then find "$d" \
                                -name .packlist \
-                               -delete \
-                               || die
+                               -delete || die
+                       fi
                done
        else
                rm -rf "${ED%/}"/usr/share/gitweb

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 592c262cdb8..1fb66925cbf 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -544,10 +544,10 @@ src_install() {
                newdoc  "${S}"/gitweb/README README.gitweb
 
                for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
-                       test -d "$d" && find "${d}" \
+                       if test -d "$d" ; then find "$d" \
                                -name .packlist \
-                               -delete \
-                               || die
+                               -delete || die
+                       fi
                done
        else
                rm -rf "${ED%/}"/usr/share/gitweb

diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 592c262cdb8..1fb66925cbf 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -544,10 +544,10 @@ src_install() {
                newdoc  "${S}"/gitweb/README README.gitweb
 
                for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
-                       test -d "$d" && find "${d}" \
+                       if test -d "$d" ; then find "$d" \
                                -name .packlist \
-                               -delete \
-                               || die
+                               -delete || die
+                       fi
                done
        else
                rm -rf "${ED%/}"/usr/share/gitweb

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 592c262cdb8..259fc34ecd4 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -544,10 +544,10 @@ src_install() {
                newdoc  "${S}"/gitweb/README README.gitweb
 
                for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
-                       test -d "$d" && find "${d}" \
+                       if test -d "$d" ; then find "${d}" \
                                -name .packlist \
-                               -delete \
-                               || die
+                               -delete || die
+                       fi
                done
        else
                rm -rf "${ED%/}"/usr/share/gitweb

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 592c262cdb8..1fb66925cbf 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -544,10 +544,10 @@ src_install() {
                newdoc  "${S}"/gitweb/README README.gitweb
 
                for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do
-                       test -d "$d" && find "${d}" \
+                       if test -d "$d" ; then find "$d" \
                                -name .packlist \
-                               -delete \
-                               || die
+                               -delete || die
+                       fi
                done
        else
                rm -rf "${ED%/}"/usr/share/gitweb