Check-in [ccde6da1a3]

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

Overview
Comment:MFT: make.conf: Fix appending MASTERNAME-make.conf twice Reported by: kwm Ticket: [674c0b93bf2]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | 3.0.x
Files: files | file ages | folders
SHA1:ccde6da1a334a2cef0330ca056a92a0dbd0934f0
User & Date: bdrewery 2013-06-08 12:09:17
Context
2013-06-23
12:03
MFT: Quote filenames check-in: 30a0468a6d user: bdrewery tags: 3.0.x
2013-06-08
12:09
MFT: make.conf: Fix appending MASTERNAME-make.conf twice Reported by: kwm Ticket: [674c0b93bf2] check-in: ccde6da1a3 user: bdrewery tags: 3.0.x
11:08
Tag 3.0.3 Release check-in: 2d290e7f87 user: bdrewery tags: 3.0.x, 3.0.3
Changes

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

916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
	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







|
|







916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
	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