Date: Fri, 18 Apr 2014 09:29:05 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Adam Weinberger <adamw@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r351425 - in head/www: =?UTF-8?Q?mod=5Fpython=33?= =?UTF-8?Q?=33=20mod=5Fpython=33=33/files=20mod=5Fpython=33=35?= Message-ID: <6861f715573fb50f45096a5031251c49@shatow.net> In-Reply-To: <71156fd2cfc1ce7b2c32461d1c7bc9c7@shatow.net> References: <201404162231.s3GMVXLE073817@svn.freebsd.org> <534F48EC.4070105@FreeBSD.org> <20140417170004.GA67659@apnoea.adamw.org> <85d789c59f29a3c5152b4b338113f06b@shatow.net> <71156fd2cfc1ce7b2c32461d1c7bc9c7@shatow.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2014-04-17 12:10, Bryan Drewery wrote: > On 2014-04-17 12:04, Bryan Drewery wrote: >> On 2014-04-17 12:00, Adam Weinberger wrote: >>>>> (2014/04/16 @ 2322 EST): Bryan Drewery said, in 1.5K: << >>>> On 4/16/2014 5:31 PM, Olli Hauer wrote: >>>> > - fix filesystem touch before install (mod_python33) >>>> > - add CONFLICTS_INSTALL >>>> > - install egg-info to shut up the qa script (no cherry picking ;( >>>> >>>> It's not forcing you to install it. Just to act on it. Either >>>> install or >>>> rm it from STAGEDIR. >>>> >>>>> end of "Re: svn commit: r351425 - in head/www: mod_python33 >>>>> mod_python33/files mod_python35" from Bryan Drewery << >>> >>> Please, this is a huge step backwards. >>> >>> Can we just have an @ignore macro in /usr/ports/Keywords? Or make the >>> qa script spit out a warning instead of an error? Or just have a >>> little >>> bit of trust in committers and tell them to be sure to examine the >>> output of check-orphans carefully? >>> >> >> Yes I am working on this. > > My first pass from a few weeks ago: > > http://people.freebsd.org/~bdrewery/patches/pkg-ignored.diff > > It has some issues though, namely with PORTDOCS/PORTEXAMPLES. > > Once I finish fixing check-orphans I will revisit this. > >> >> I am also working on fixing check-orphans to respect >> PORTEXAMPLES/PORTDOCS. >> I am working towards moving a lot of poudriere logic into ports so >> that >> all tools can use consistent good checks, namely >> Tinderbox/Redports/QAT >> and check-orphans/makeplist. >> >> It just takes time. FYI I am almost done with all of this. Here's my pending commit log. Just need to wrap up a few things and test on a pkg_install system: - Bug fixes: makeplist/check-orphans: - Fix showing directories owned by RUN_DEPENDS/LIB_DEPENDS - Use proper "rmdir PATH" syntax, not "rmdir >/dev/null... PATH" which pkg will not recognize. - Add a whitelist mechanism to be maintained in check-stagedir.sh and add "*.bak" check-orphans: - Fix showing PORTDOCS/PORTEXAMPLES files when the OPTIONS are not set. makeplist will still suggest them. - Fix showing files installed through unselected OPTIONS as orphans, by considering "@comment file" to be ignored. [1] check_leftovers.sh: - Prefer longer values for PLIST_SUB bsd.options.mk: - Fix NOPORTDOCS/WITHOUT_NLS/NOPORTEXAMPLES not unsetting their respective OPTIONS. - check-stagedir.sh refactoring: - Switch to using new PLIST_SUB_SED - Use ! instead of , in sed(1) regex to allow files/dirs with ',' - Rework PORTEXAMPLES/PORTDOCS handling so it acts on PLIST_SUB_SED'd value and not absolutes. Also simplify the regex for these a bit to allow reuse. - No longer need DOCSDIRS/EXAMPLESDIR in env - Add a Scripts/plist_sub_sed_sort.sh to prefer longer values when substituting over shorter values. [1] This is a partial solution, we may want need a plist.ignored too. It doesn't make much sense to add files in main pkg-plist we don't care about, but maybe it does since you'll see and reconsider them being ignored someday. Also, I wish we were using @ignore instead of @comment in all of our PLIST_SUB deactivations. This is too big a task to make happen though. For context, check_leftover.sh is for poudriere/tinderbox usage to get a consistent list of leftovers ignoring an approved whitelist of files. And I was wrong before when I said staging eliminates leftovers. -- Regards, Bryan Drewery
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6861f715573fb50f45096a5031251c49>