Date: Thu, 20 May 2021 18:58:32 +0300 From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: Mathieu Arnold <mat@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: <YKaHKMeNyypOxH4F@hades.panopticon> In-Reply-To: <20210520151054.rs5eqpqqj5huo4gf@aching.in.mat.cc> References: <202105201305.14KD5WBN051420@gitrepo.freebsd.org> <20210520151054.rs5eqpqqj5huo4gf@aching.in.mat.cc>
next in thread | previous in thread | raw e-mail | index | archive | help
* Mathieu Arnold (mat@freebsd.org) wrote: > > The branch main has been updated by amdmi3: > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=1ec8ef21dda91f9228bae2734d86e1dd6e306b66 > > > > 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 > > > > www/glpi: fix plist, remove more garbage files in post-extract > > > > Approved by: portmgr blanket > > --- > > www/glpi/Makefile | 4 ++-- > > www/glpi/pkg-plist | 6 ------ > > 2 files changed, 2 insertions(+), 8 deletions(-) > > > > 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= PHP=ldap > > IMAP_USE= PHP=imap > > > > 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 Right, I've had a doubt, but stage-qa was silent for some reason and haven't highlighted files not removed because of this. -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: https://github.com/AMDmi3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YKaHKMeNyypOxH4F>