View | Details | Raw Unified
Collapse All | Expand All

(-) revdep-rebuild.orig (-2 / +4 lines)
 Lines 208-214    Link Here  
			avoid_utils="$1"
			avoid_utils="$1"
			;;
			;;
		-nc|-C|--no-color|--nocolor)
		-nc|-C|--no-color|--nocolor)
			# TODO: Does this variable do anything now that the main color functions are removed?
 
			export NOCOLOR=1
			export NOCOLOR=1
			;;
			;;
		-l|-np|--no-ld-path)
		-l|-np|--no-ld-path)
 Lines 248-255    Link Here  
				sed 's:/var/db/pkg/\(.*\)/CONTENTS:\1:'
				sed 's:/var/db/pkg/\(.*\)/CONTENTS:\1:'
		}
		}
	fi
	fi
	# Normalize some EMERGE_OPTIONS
 
	EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-p/--pretend})
	EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-p/--pretend})
	EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-f/--fetchonly})
	EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-f/--fetchonly})
	EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-f/--verbose})
 
	if [[ ${EMERGE_OPTIONS[@]} != *--pretend* && $UID -ne 0 ]]; then
	if [[ ${EMERGE_OPTIONS[@]} != *--pretend* && $UID -ne 0 ]]; then
		ewarn "You are not superuser. Adding --pretend to emerge options."
		ewarn "You are not superuser. Adding --pretend to emerge options."
		EMERGE_OPTIONS+=(--pretend)
		EMERGE_OPTIONS+=(--pretend)
 Lines 315-321    Link Here  
LD_LIBRARY_MASK=$(clean_var "$LD_LIBRARY_MASK")
LD_LIBRARY_MASK=$(clean_var "$LD_LIBRARY_MASK")

        
# Use the color preference from portage
# Use the color preference from portage

            

              
NOCOLOR=$(portageq envvar NOCOLOR)

              
export NOCOLOR=$(portageq envvar NOCOLOR)

            

        

        
set_trap() {
set_trap() {

        
	trap "rm_temp $1" SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
	trap "rm_temp $1" SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM

  

    

    

       Lines 374-379
       
    
  Link Here 
    

  

        
		# We don't care if these emerge options change
		# We don't care if these emerge options change

        
		EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--pretend/})
		EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--pretend/})

        
		EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--fetchonly/})
		EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--fetchonly/})

            

              
              
		EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--verbose/})

            

        
		cat <<- EOF
		cat <<- EOF

        
			SEARCH_DIRS="$SEARCH_DIRS"
			SEARCH_DIRS="$SEARCH_DIRS"

        
			SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK"
			SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK"