View | Details | Raw Unified
Collapse All | Expand All

(-) bin/dispatch-conf (-2 / +3 lines)
 Lines 28-34    Link Here  
from portage import dispatch_conf
from portage import dispatch_conf
from portage.process import find_binary
from portage.process import find_binary

            

              
FIND_EXTANT_CONFIGS  = "find '%s' %s -iname '._cfg????_%s' ! -iname '.*~' ! -iname '.*.bak'"

              
FIND_EXTANT_CONFIGS  = "find '%s' %s -name '._cfg????_%s' ! -name '.*~' ! -iname '.*.bak' -print"

            

        
DIFF_CONTENTS        = "diff -Nu '%s' '%s'"
DIFF_CONTENTS        = "diff -Nu '%s' '%s'"

        
DIFF_CVS_INTERP      = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '# .Header:.*'"
DIFF_CVS_INTERP      = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '# .Header:.*'"

        
DIFF_WSCOMMENTS      = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '^[-+]#' | grep -v '^[-+][:space:]*$'"
DIFF_WSCOMMENTS      = "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep -v '^[-+]#' | grep -v '^[-+][:space:]*$'"

  

    

    

       Lines 93-103
       
    
  Link Here 
    

  

        
            except OSError:
            except OSError:

        
                continue
                continue

        
            basename = "*"
            basename = "*"

            

              
            find_opts = ""

              
            find_opts = "-name '.*' -type d -prune -o"

            

        
            if not stat.S_ISDIR(mymode):
            if not stat.S_ISDIR(mymode):

        
                path, basename = os.path.split(path)
                path, basename = os.path.split(path)

        
                find_opts = "-maxdepth 1"
                find_opts = "-maxdepth 1"

        

            

              
              
            print FIND_EXTANT_CONFIGS % (path, find_opts, basename)

            

        
            confs += self.massage(os.popen(FIND_EXTANT_CONFIGS % (path, find_opts, basename)).readlines())
            confs += self.massage(os.popen(FIND_EXTANT_CONFIGS % (path, find_opts, basename)).readlines())

        

        
        if self.options['use-rcs'] == 'yes':
        if self.options['use-rcs'] == 'yes':



(-) bin/etc-update
      (-3 / +5 lines)




  

    

    

       Lines 50-66
       
    
  Link Here 
    

  

        

        
	for path in ${CONFIG_PROTECT} ; do
	for path in ${CONFIG_PROTECT} ; do

        
		path="${ROOT}${path}"
		path="${ROOT}${path}"

            

              
		find_opts="-iname ._cfg????_*"

              
		# Do not traverse hidden directories such as .svn or .git.

            

            

              

              
		find_opts="-name .* -type d -prune -o -name ._cfg????_*"

            

        
		if [ ! -d "${path}" ]; then
		if [ ! -d "${path}" ]; then

        
			[ ! -f "${path}" ] && continue
			[ ! -f "${path}" ] && continue

        
			my_basename="${path##*/}"
			my_basename="${path##*/}"

        
			path="${path%/*}"
			path="${path%/*}"

            

              
			find_opts="-maxdepth 1 -iname ._cfg????_${my_basename}"

              
			find_opts="-maxdepth 1 -name ._cfg????_${my_basename}"

            

        
		fi
		fi

        

        
		ofile=""
		ofile=""

        
		# The below set -f turns off file name globbing in the ${find_opts} expansion.
		# The below set -f turns off file name globbing in the ${find_opts} expansion.

            

              
		for file in $(set -f; find ${path}/ ${find_opts} ! -iname '.*~' ! -iname '.*.bak' |

              
		for file in $(set -f ; find ${path}/ ${find_opts} \

            

            

              

              
		       ! -name '.*~' ! -iname '.*.bak' -print |

            

        
			   sed -e "s:\(^.*/\)\(\._cfg[0-9]*_\)\(.*$\):\1\2\3\%\2\%\3:" |
			   sed -e "s:\(^.*/\)\(\._cfg[0-9]*_\)\(.*$\):\1\2\3\%\2\%\3:" |

        
			   sort -t'%' -k3 -k2 | LANG=POSIX LC_ALL=POSIX cut -f1 -d'%'); do
			   sort -t'%' -k3 -k2 | LANG=POSIX LC_ALL=POSIX cut -f1 -d'%'); do