Check-in [1285799278]

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

Overview
Comment:Fix comment path for PORT_DBDIR
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1285799278d63b24ca0009771c85f9e7849436a0
User & Date: bdrewery 2013-06-02 00:02:28
Context
2013-06-02
00:06
Remove cache_get_key(), this never panned out check-in: 30a02c9f34 user: bdrewery tags: trunk
00:02
Fix comment path for PORT_DBDIR check-in: 1285799278 user: bdrewery tags: trunk
2013-06-01
23:59
bulk: Jail pkg-repo again. This reverts [c9ef811ac5] We should keep this jailed to avoid pkg(8) and libarchive exploits in case some package has dangerous data in its manifest, etc. check-in: b801cb0d5d user: bdrewery tags: trunk
Changes

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

2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
				delete_pkg ${pkg}
				return 0
				;;
			esac
		done
	fi

	# Check if the compiled options match the current options from make.conf and /var/db/options
	if [ "${CHECK_CHANGED_OPTIONS:-verbose}" != "no" ]; then
		current_options=$(injail make -C /usr/ports/${o} pretty-print-config | \
			tr ' ' '\n' | sed -n 's/^\+\(.*\)/\1/p' | sort | tr '\n' ' ')
		compiled_options=$(pkg_get_options ${pkg})

		if [ "${compiled_options}" != "${current_options}" ]; then
			msg "Options changed, deleting: ${pkg##*/}"







|







2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
				delete_pkg ${pkg}
				return 0
				;;
			esac
		done
	fi

	# Check if the compiled options match the current options from make.conf and /var/db/ports
	if [ "${CHECK_CHANGED_OPTIONS:-verbose}" != "no" ]; then
		current_options=$(injail make -C /usr/ports/${o} pretty-print-config | \
			tr ' ' '\n' | sed -n 's/^\+\(.*\)/\1/p' | sort | tr '\n' ' ')
		compiled_options=$(pkg_get_options ${pkg})

		if [ "${compiled_options}" != "${current_options}" ]; then
			msg "Options changed, deleting: ${pkg##*/}"