Date: Tue, 6 Sep 2016 19:43:25 +0100 From: Matthew Seaman <matthew@FreeBSD.org> To: Palle Girgensohn <girgen@pingpong.net> Cc: Palle Girgensohn <girgen@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r421361 - in head/databases: postgresql92-server postgresql96-client postgresql96-server Message-ID: <c164f590-7f13-145c-3f0a-a404045e7947@FreeBSD.org> In-Reply-To: <08162A3A-4689-4BD9-A4C2-9E3547A65A0B@pingpong.net> References: <201609051159.u85BxXlY065121@repo.freebsd.org> <277e42c7-60a2-29c2-4ca4-7d10a88536e6@FreeBSD.org> <08162A3A-4689-4BD9-A4C2-9E3547A65A0B@pingpong.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--PB9if93vNWNg7iiALjxWJD6Wvqdk5Sq4g
Content-Type: multipart/mixed; boundary="uW4iaoAqVDrNDXJobPvbG9C2hi48j4pdA";
protected-headers="v1"
From: Matthew Seaman <matthew@FreeBSD.org>
To: Palle Girgensohn <girgen@pingpong.net>
Cc: Palle Girgensohn <girgen@FreeBSD.org>, ports-committers@freebsd.org,
svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Message-ID: <c164f590-7f13-145c-3f0a-a404045e7947@FreeBSD.org>
Subject: Re: svn commit: r421361 - in head/databases: postgresql92-server
postgresql96-client postgresql96-server
References: <201609051159.u85BxXlY065121@repo.freebsd.org>
<277e42c7-60a2-29c2-4ca4-7d10a88536e6@FreeBSD.org>
<08162A3A-4689-4BD9-A4C2-9E3547A65A0B@pingpong.net>
In-Reply-To: <08162A3A-4689-4BD9-A4C2-9E3547A65A0B@pingpong.net>
--uW4iaoAqVDrNDXJobPvbG9C2hi48j4pdA
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: quoted-printable
On 06/09/2016 16:57, Palle Girgensohn wrote:
> I removed that in a subsequent commit :-)
Yes, so you did. With respect, that's not what I was on about though.
I'm sorry -- it seems I didn't make myself clear.
After the commit to remove the line from the pkg-plist for
postgresql96-server that port will not pass the 'stage-qa' tests because
you're still creating the directory '${STAGING}${LOCALBASE}/${PG_USER}'
in the staging area and it now doesn't appear in the pkg-plist.
The patch I included prevents creating that directory by
postgresql96-server, so it will now pass the 'stage-qa' tests. Without
this poudriere, for instance, will consider the package build to have
failed.
Cheers,
Matthew
>=20
> Palle=20
>=20
>> 6 sep. 2016 kl. 13:20 skrev Matthew Seaman <matthew@FreeBSD.org>:
>>
>>> On 05/09/2016 12:59, Palle Girgensohn wrote:
>>> Modified: head/databases/postgresql96-server/pkg-plist-server
>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
>>> --- head/databases/postgresql96-server/pkg-plist-server Mon Sep 5=
11:15:29 2016 (r421360)
>>> +++ head/databases/postgresql96-server/pkg-plist-server Mon Sep 5=
11:59:32 2016 (r421361)
>>> @@ -775,5 +775,3 @@ lib/libpgcommon.a
>>> %%DATADIR%%/tsearch_data/synonym_sample.syn
>>> %%DATADIR%%/tsearch_data/thesaurus_sample.ths
>>> %%DATADIR%%/tsearch_data/turkish.stop
>>> -@dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%
>>> -
>>
>> This still fails stage-qa in poudriere, because you're creating
>> a directory ${STAGEDIR}${LOCALBASE}/postgres
>>
>> =3D=3D=3D=3D> Running Q/A tests (stage-qa)
>> =3D=3D=3D=3D> Checking for pkg-plist issues (check-plist)
>> =3D=3D=3D> Parsing plist
>> =3D=3D=3D> Checking for items in STAGEDIR missing from pkg-plist
>> Error: Orphaned: @dir %%PG_USER%%
>> =3D=3D=3D> Checking for items in pkg-plist which are not in STAGEDIR
>> =3D=3D=3D> Error: Plist issues found.
>> *** Error code 1
>>
>> Stop.
>> make: stopped in /usr/ports/databases/postgresql96-server
>> =3D=3D=3D=3D>> Error: check-plist failures detected
>>
>> This should help:
>>
>> # svn diff databases/postgresql92-server databases/postgresql96-server=
>> Index: databases/postgresql92-server/Makefile
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>> --- databases/postgresql92-server/Makefile (revision 421417)
>> +++ databases/postgresql92-server/Makefile (working copy)
>> @@ -243,7 +243,9 @@
>> ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\
>> ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
>> ${STAGEDIR}${PREFIX}/etc/periodic/daily
>> +. if ${PORTVERSION:M9.[12345].*}
>> ${MKDIR} ${STAGEDIR}${PREFIX}/${PG_USER}
>> +. endif
>> . endif # SERVER_ONLY
>> . if defined(CLIENT_ONLY)
>> @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
>> ${MAKE_ARGS} install-local
>> Index: databases/postgresql96-server/Makefile
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>> --- databases/postgresql96-server/Makefile (revision 421417)
>> +++ databases/postgresql96-server/Makefile (working copy)
>> @@ -2,7 +2,7 @@
>> # $FreeBSD$
>>
>> DISTVERSION?=3D 9.6rc1
>> -PORTREVISION?=3D 1
>> +PORTREVISION?=3D 2
>>
>> MAINTAINER?=3D pgsql@FreeBSD.org
>>
>> Cheers,
>>
>> Matthew
>>
>>
>=20
--uW4iaoAqVDrNDXJobPvbG9C2hi48j4pdA--
--PB9if93vNWNg7iiALjxWJD6Wvqdk5Sq4g
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQJ8BAEBCgBmBQJXzw5WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NTNBNjhCOTEzQTRFNkNGM0UxRTEzMjZC
QjIzQUY1MThFMUE0MDEzAAoJELsjr1GOGkATNUgP/jB+RZcMAYHUnCg2ZIGHfMbX
Jb/9tQ7a8H695zTrDr9g+ciSdEImVAlvD7kaFDWEJCVa91R9Ym0qQmnJfD2cu3MD
7wOvzmK0wO23X6JDRsqceYxO8us/25206YDIVL0n4Rsuioiqyor6cSsngNU3nryc
Ohu35pJ5i9oCuNsAeKQu7J4KKhkzKd5o+zo7Lw/KDzon+6zT6rPuDnSWEkdsUNzE
oiPNH7XSnSc6A/5uzXOYKMKwYWX7wDPkrTOB0yhzQun3FbQZd6KB/bmSaWCBnZcN
ikI1BUAPrxuvU0I1nxJyObffMjUV3BRliTvdO7N9psueM+WkI6NLy8nNJ8KHIqev
gwizR1llhQstpbeXYyTm0MFu1DAU1xMM0XifiUDBkDzAJTD9LbN4iabm+ZCPAq7h
fQVprZcYv8Oacl3TDVOEnX//xrBONgD/fpZFWGUZ4jF7Op49lHLUKdgjVzMziLhI
EqRA5n1Jz/L6WWK1Yy6pJ3RRa8w+QLtrpNgx7/N7MLh2/XBS44wlsj5eQG05/VzB
2+UhZ3OXK/QM0LYosrXKXzibAXnAlWroFbM/etsTeXOGorAs56H95mxV64nyHyYp
vGvH9cdCJUo70YZnUPsGf8utCbu+LzYQ2JaqwIbMQ21JdUcAi1v3W0Enyj5oz6E/
cI3rPlblUsU3LVFHnJlC
=Nnsr
-----END PGP SIGNATURE-----
--PB9if93vNWNg7iiALjxWJD6Wvqdk5Sq4g--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?c164f590-7f13-145c-3f0a-a404045e7947>