Date: Thu, 20 May 2021 17:10:54 +0200 From: Mathieu Arnold <mat@freebsd.org> To: Dmitry Marakasov <amdmi3@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 1ec8ef21dda9 - main - www/glpi: fix plist, remove more garbage files in post-extract Message-ID: <20210520151054.rs5eqpqqj5huo4gf@aching.in.mat.cc> In-Reply-To: <202105201305.14KD5WBN051420@gitrepo.freebsd.org> References: <202105201305.14KD5WBN051420@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--jx5dkpvcroo77xn6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 20, 2021 at 01:05:32PM +0000, Dmitry Marakasov wrote: > The branch main has been updated by amdmi3: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D1ec8ef21dda91f9228bae273= 4d86e1dd6e306b66 >=20 > commit 1ec8ef21dda91f9228bae2734d86e1dd6e306b66 > Author: Dmitry Marakasov <amdmi3@FreeBSD.org> > AuthorDate: 2021-05-20 13:01:37 +0000 > Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> > CommitDate: 2021-05-20 13:02:53 +0000 >=20 > www/glpi: fix plist, remove more garbage files in post-extract > =20 > Approved by: portmgr blanket > --- > www/glpi/Makefile | 4 ++-- > www/glpi/pkg-plist | 6 ------ > 2 files changed, 2 insertions(+), 8 deletions(-) >=20 > diff --git a/www/glpi/Makefile b/www/glpi/Makefile > index 2ff7f0f4445a..94fd261426b9 100644 > --- a/www/glpi/Makefile > +++ b/www/glpi/Makefile > @@ -32,10 +32,10 @@ LDAP_USE=3D PHP=3Dldap > IMAP_USE=3D PHP=3Dimap > =20 > post-extract: > - @${FIND} ${WRKSRC} -name '*~' -delete > + @${FIND} ${WRKSRC} -name '*~' -o -name '*.orig' -o -name '*.rej' -delete I know find(1)'s syntax is not easy, but this is not actually doing what you think it does. Because two predicates without `-o` (or) actually get a `-a` (and) and because of precendence between "and" and "or", it ends up actually doing this: @${FIND} ${WRKSRC} ( -name '*~' ) -o ( -name '*.orig' ) -o ( -name '*.rej' = -delete ) What you actually want is: @${FIND} ${WRKSRC} ( -name '*~' -o -name '*.orig' -o -name '*.rej' ) -delete --=20 Mathieu Arnold --jx5dkpvcroo77xn6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmCme/pfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgKTyxAAo8jPd4LWW1w6SPP75Z7rSVOtTSmlWAnIo8jcHAxknsbMCiJlqcAZW9Lv Lk1eYqCCWGfkmsJd+s70+6SSQ3/Yq0uKr+1skkBVHn2FxMeNoHwyHrQ05eJ1ziG/ e+hAV43C5rS8T5UC6x+hhwvfLYdxwfJ/W0iUNN5qgq94uAun7wMwBBsny3g/B+5+ HQqz/RV8rSnTrPHIvtx16MqMTfyfP1EXPQKURca5Ozcazy+z8ibIfWUl325v4LC/ 94p9ZCKEBaP6583iLyhlroPPDRyuCkD2BJAVSx8UwyMKsOJesb3OG1eU2JpRa5DV p+1YmAqgBuGFz5+GGSaR0y0cjFLOB+cCPEOJXwYr0hsQFKPVkwP2AlpI5bawvK1S 9k0HjZfM0b40iqet5GZ7hykjG8kBap6UZTib8csHz55vPXAo/KTvs9VHDXzolaoV 40a58zmS5q+jJTrKLvChZJixcVJ5Fc9Z9HyTSHPOKKSuqCFjs2mjFlUf/AqL8qTA LHQDjmII6sI+NcuL6GC8ljoW1H/zCPtDpJBqhWHT0MFP3mCz5iNqpO+ndry6a6ma Kptbgk0DhHMPAC2dPksO8TmhX+7lPFf/fGTA0pdT2GzNUzSVrLcpBEF6AaeWpE0C bCvWUeI0bAo+UOslQwYoySNUtp5bXO3o9QUMqTIxPOGX34eX7iY= =4SQx -----END PGP SIGNATURE----- --jx5dkpvcroo77xn6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210520151054.rs5eqpqqj5huo4gf>