Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 686350 | Differences between
and this patch

Collapse All | Expand All

(-)a/eclass/savedconfig.eclass (-13 / +12 lines)
Lines 111-129 restore_config() { Link Here
111
111
112
	use savedconfig || return
112
	use savedconfig || return
113
113
114
	local found check configfile
114
	local configfile found package_dependency_spec
115
	local base=${PORTAGE_CONFIGROOT%/}/etc/portage/savedconfig
115
	local base=${PORTAGE_CONFIGROOT%/}/etc/portage/savedconfig
116
	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
116
	for package_dependency_spec in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
117
		configfile=${base}/${CTARGET}/${check}
117
		for configfile in ${CTARGET:+${CTARGET}/${package_dependency_spec}} ${CHOST:+${CHOST}/${package_dependency_spec}} ${package_dependency_spec}; do
118
		[[ -r ${configfile} ]] || configfile=${base}/${CHOST}/${check}
118
			configfile=${base}/${configfile}
119
		[[ -r ${configfile} ]] || configfile=${base}/${check}
119
			einfo "Checking existence of ${configfile} ..."
120
		einfo "Checking existence of ${configfile} ..."
120
			if [[ -r "${configfile}" ]]; then
121
		if [[ -r "${configfile}" ]]; then
121
				einfo "Found ${configfile}"
122
			einfo "Found ${configfile}"
122
				found=${configfile}
123
			found=${configfile}
123
				_SAVEDCONFIG_CONFIGURATION_FILE=${configfile#${base}/}
124
			_SAVEDCONFIG_CONFIGURATION_FILE=${configfile#${base}/}
124
				break 2
125
			break
125
			fi
126
		fi
126
		done
127
	done
127
	done
128
	if [[ -f ${found} ]]; then
128
	if [[ -f ${found} ]]; then
129
		elog "Building using saved configfile ${found}"
129
		elog "Building using saved configfile ${found}"
130
- 

Return to bug 686350