View | Details | Raw Unified | Return to bug 181799 | Differences between
and this patch

Collapse All | Expand All

(-)src/share/poudriere/common.sh (-1 / +1 lines)
Lines 2194-2200 Link Here
2194
	fi
2194
	fi
2195
	if [ -z "${LISTPORTS}" ]; then
2195
	if [ -z "${LISTPORTS}" ]; then
2196
		[ -n "${LISTPKGS}" ] &&
2196
		[ -n "${LISTPKGS}" ] &&
2197
			grep -h -v -E '(^[[:space:]]*#|^[[:space:]]*$)' ${LISTPKGS}
2197
			grep -h -v -E '(^[[:space:]]*#|^[[:space:]]*$)' ${LISTPKGS} | sed -e 's/[[:space:]]*#.*$//'
2198
	else
2198
	else
2199
		echo ${LISTPORTS} | tr ' ' '\n'
2199
		echo ${LISTPORTS} | tr ' ' '\n'
2200
	fi
2200
	fi
(-)src/share/poudriere/options.sh (-1 / +1 lines)
Lines 109-115 Link Here
109
if [ $# -eq 0 ]; then
109
if [ $# -eq 0 ]; then
110
	[ -n "${BULK_LIST}" ] || err 1 "No packages specified"
110
	[ -n "${BULK_LIST}" ] || err 1 "No packages specified"
111
	[ -f ${BULK_LIST} ] || err 1 "No such list of packages: ${BULK_LIST}"
111
	[ -f ${BULK_LIST} ] || err 1 "No such list of packages: ${BULK_LIST}"
112
LISTPORTS=`grep -v -E '(^[[:space:]]*#|^[[:space:]]*$)' ${BULK_LIST}`
112
LISTPORTS=`grep -v -E '(^[[:space:]]*#|^[[:space:]]*$)' ${BULK_LIST} | sed -e 's/[[:space:]]*#.*$//'`
113
else
113
else
114
	[ -z "${BULK_LIST}" ] ||
114
	[ -z "${BULK_LIST}" ] ||
115
		err 1 "command line arguments and list of ports cannot be used at the same time"
115
		err 1 "command line arguments and list of ports cannot be used at the same time"

Return to bug 181799