dev-vcs/git: improve perl packlist cleanup

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

diff --git a/dev-vcs/git/git-2.16.1.ebuild b/dev-vcs/git/git-2.16.1.ebuild
index ef8239e6b0df77eca8d8934d2c136d5619512325..e675a47660d567f2eb288cde1dde2d13a8c4878c 100644 (file)
--- 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 b1eec1319702445d941b594cf7adf40a72017d3b..d0faf8d3a1fcbf93cb0a6cb28583c2c210fb1cb9 100644 (file)
--- 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 ec767a414c471e7fbe0e842e0432e472fea853a0..5f55ce0d640b0431d8da0c2cb6a9beec074a0963 100644 (file)
--- 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 592c262cdb8633b52a14b2999d4be138b99ffbb4..1fb66925cbfb54e1dfc9529fdc2deb5f8e874a19 100644 (file)
--- 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 592c262cdb8633b52a14b2999d4be138b99ffbb4..1fb66925cbfb54e1dfc9529fdc2deb5f8e874a19 100644 (file)
--- 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 592c262cdb8633b52a14b2999d4be138b99ffbb4..259fc34ecd4e3811d5b5bdc5fb377173196528b4 100644 (file)
--- 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 592c262cdb8633b52a14b2999d4be138b99ffbb4..1fb66925cbfb54e1dfc9529fdc2deb5f8e874a19 100644 (file)
--- 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