Check-in [f4a3eb687b]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:make.conf: Fix appending MASTERNAME-make.conf twice Reported by: kwm Ticket: [674c0b93bf2]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: f4a3eb687b9fe468d6919bb8ab85d651b015a127
User & Date: bdrewery 2013-06-02 21:56:09
References
2013-06-02
21:56 Closed ticket [674c0b93bf]: poudriere includes custom make.conf twice plus 6 other changes artifact: b7a3f04ae7 user: bdrewery
Context
2013-06-03
10:34
Whitespace Submitted by: ak check-in: b9756632e0 user: bdrewery tags: trunk
2013-06-02
21:56
make.conf: Fix appending MASTERNAME-make.conf twice Reported by: kwm Ticket: [674c0b93bf2] check-in: f4a3eb687b user: bdrewery tags: trunk
14:13
Remove need of shared temporary file. check-in: 4dd80e9a9b user: antoine tags: trunk
Changes

Changes to src/share/poudriere/common.sh.

910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
	local dst_makeconf=$1
	local name=$2
	local ptname=$3
	local setname=$4
	local makeconf opt

	makeconf="- ${setname} ${ptname} ${name} ${name}-${ptname}"
	[ -n "${setname}" ] && makeconf="${makeconf} ${name}-${setname}"
	makeconf="${makeconf} ${MASTERNAME}"
	for opt in ${makeconf}; do
		append_make ${opt} ${dst_makeconf}
	done
}

jail_stop() {
	[ $# -ne 0 ] && eargs







|
|







910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
	local dst_makeconf=$1
	local name=$2
	local ptname=$3
	local setname=$4
	local makeconf opt

	makeconf="- ${setname} ${ptname} ${name} ${name}-${ptname}"
	[ -n "${setname}" ] && makeconf="${makeconf} ${name}-${setname} \
		    ${name}-${ptname}-${setname}"
	for opt in ${makeconf}; do
		append_make ${opt} ${dst_makeconf}
	done
}

jail_stop() {
	[ $# -ne 0 ] && eargs