Attachment #163003 for bug #172496

View | Details | Raw Unified | Return to bug 172496
Collapse All | Expand All

Lines 56-61 Link Here

(-)cnf/make.globals (+3 lines)
56	# This option will be removed and forced to yes.	56	# This option will be removed and forced to yes.
57	AUTOCLEAN="yes"	57	AUTOCLEAN="yes"
58		58
		59	# Don't compress files with these suffixes.
		60	PORTAGE_COMPRESS_EXCLUDE_SUFFIXES="css gif htm[l]? jp[e]?g js pdf png"
		61
59	# Number of mirrors to try when a downloaded file has an incorrect checksum.	62	# Number of mirrors to try when a downloaded file has an incorrect checksum.
60	PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS="5"	63	PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS="5"
61		64




		exit 1
		;;
	*)
		mask_ext_re=""
		set -f
		for x in $PORTAGE_COMPRESS_EXCLUDE_SUFFIXES ; do
			mask_ext_re+="|$x"
		done
		set +f
		mask_ext_re="^(${mask_ext_re:1})\$"
		declare -a filtered_args=()
		i=0
		for x in "$@" ; do
			[[ ${x##*.} =~ $mask_ext_re ]] && continue
			filtered_args[$i]=$x
			(( i++ ))
		done
		set "${filtered_args[@]}"

		# If a compressed version of the file already exists, simply
		# delete it so that the compressor doesn't whine (bzip2 will
		# complain and skip, gzip will prompt for input)

Lines 430-435 Link Here

(-)man/make.conf.5 (+7 lines)
430	\fBPORTAGE_COMPRESS_FLAGS\fR = \fI"\-9"\fR	430	\fBPORTAGE_COMPRESS_FLAGS\fR = \fI"\-9"\fR
431	This variable contains flags for the \fBPORTAGE_COMPRESS\fR command.	431	This variable contains flags for the \fBPORTAGE_COMPRESS\fR command.
432	.TP	432	.TP
		433	.TP
		434	\fBPORTAGE_COMPRESS_EXCLUDE_SUFFIXES\fR = \fI"gif htm[l]? jp[e]?g pdf png"\fR
		435	This variable contains a space delimited list of file suffixes for which
		436	matching files are excluded when the \fBPORTAGE_COMPRESS\fR command is
		437	called. Regular expressions are supported and the match is performed only
		438	against the portion of the file name which follows the last period character.
		439	.TP
433	.B PORTAGE_ELOG_CLASSES	440	.B PORTAGE_ELOG_CLASSES
434	.TP	441	.TP
435	.B PORTAGE_ELOG_SYSTEM	442	.B PORTAGE_ELOG_SYSTEM

Return to bug 172496

Lines 63-68 Link Here

(-)bin/ecompress (+16 lines)
63	exit 1	63	exit 1
64	;;	64	;;
65	*)	65	*)
		66	mask_ext_re=""
		67	set -f
		68	for x in $PORTAGE_COMPRESS_EXCLUDE_SUFFIXES ; do
		69	mask_ext_re+="\|$x"
		70	done
		71	set +f
		72	mask_ext_re="^(${mask_ext_re:1})\$"
		73	declare -a filtered_args=()
		74	i=0
		75	for x in "$@" ; do
		76	[[ ${x##*.} =~ $mask_ext_re ]] && continue
		77	filtered_args[$i]=$x
		78	(( i++ ))
		79	done
		80	set "${filtered_args[@]}"
		81
66	# If a compressed version of the file already exists, simply	82	# If a compressed version of the file already exists, simply
67	# delete it so that the compressor doesn't whine (bzip2 will	83	# delete it so that the compressor doesn't whine (bzip2 will
68	# complain and skip, gzip will prompt for input)	84	# complain and skip, gzip will prompt for input)