Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Dec 2016 15:35:24 +0100
From:      =?UTF-8?Q?Ren=c3=a9_Ladan?= <rene@freebsd.org>
To:        Stefan Ehmann <shoesoft@gmx.net>
Cc:        "ports@freebsd.org Ports" <ports@freebsd.org>
Subject:   Re: poudriere ignores stored options after r429298
Message-ID:  <d3c87480-d3ab-e46c-70b2-70a2f24fbe6f@freebsd.org>
In-Reply-To: <544fcfdc-5cbb-3b2c-4b64-13593d2f4699@gmx.net>
References:  <544fcfdc-5cbb-3b2c-4b64-13593d2f4699@gmx.net>

next in thread | previous in thread | raw e-mail | index | archive | help
On 24-12-2016 10:09, Stefan Ehmann wrote:
> After today's ports update, poudriere ignores all options that were
> previously stored.
> 
> Everything works as before after reverting r429298 "Make the ports
> infrastructure accept at least 3 level ports"
> 
> Previously, poudriere stored its options for python27 in
> /usr/local/etc/poudriere.d/options/lang_python27
> 
> Now options are stored in
> /usr/local/etc/poudriere.d/options/_usr_ports_lang_python27

Hmm, it should still store options in the old directory, or did we
overlook something?

From
https://reviews.freebsd.org/file/data/aq3dh3bgietiaksqg764/PHID-FILE-abonf7wbxelwjoqv2aiq/D8889.diff
:

Old:
-_PORTDIRNAME=	${.CURDIR:T}
-PORTDIRNAME?=	${_PORTDIRNAME}
-PKGORIGIN?=	${PKGCATEGORY}/${PORTDIRNAME}
-OPTIONS_NAME?=	${PKGORIGIN:S/\//_/}
 OPTIONS_FILE?=	${PORT_DBDIR}/${OPTIONS_NAME}/options

New:
+PKGORIGIN?=	${.CURDIR:C/${PORTSDIR}\///}
+OPTIONS_NAME?=	${PKGORIGIN:S/\//_/g}
 OPTIONS_FILE?=	${PORT_DBDIR}/${OPTIONS_NAME}/options

On my laptop it works as expected with a just-now updated poudriere
ports tree:
> root@e17:/usr/local/etc/poudriere.d/options/lang_python27 # ls -l
> total 5
> -rw-r--r--  1 root  wheel  406 24 dec. 15:32 options

What do 'make -V PKGORIGIN' and 'make -V OPTIONS_NAME' tell?

René




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d3c87480-d3ab-e46c-70b2-70a2f24fbe6f>