View | Details | Raw Unified
Collapse All | Expand All

(-) pym/portage.py (-4 / +8 lines)
 Lines 7471-7477    Link Here  

        
			#process symlinks second-to-last, directories last.
			#process symlinks second-to-last, directories last.

        
			mydirs = []
			mydirs = []

            

              
			ignored_unlink_errnos = (errno.ENOENT, errno.ENOTDIR, errno.EISDIR)

              
			ignored_unlink_errnos = (

            

            

              

              
				errno.EBUSY, errno.ENOENT,

            

            

              

              
				errno.ENOTDIR, errno.EISDIR)

            

            

              

              
			ignored_rmdir_errnos = (

            

            

              

              
				errno.EEXIST, errno.ENOTEMPTY,

            

            

              

              
				errno.EBUSY, errno.ENOENT,

            

            

              

              
				errno.ENOTDIR, errno.EISDIR)

            

        
			modprotect = os.path.join(self.vartree.root, "lib/modules/")
			modprotect = os.path.join(self.vartree.root, "lib/modules/")

        

        
			def unlink(file_name, lstatobj):
			def unlink(file_name, lstatobj):

  

    

    

       Lines 7636-7644
       
    
  Link Here 
    

  

        
							bsd_chflags.chflags(parent_name, pflags)
							bsd_chflags.chflags(parent_name, pflags)

        
					show_unmerge("<<<", "", "dir", obj)
					show_unmerge("<<<", "", "dir", obj)

        
				except EnvironmentError, e:
				except EnvironmentError, e:

            

              
					if e.errno not in (errno.ENOENT,

              
					if e.errno not in ignored_rmdir_errnos:

            

            

              
						errno.EEXIST, errno.ENOTEMPTY,

              

            

            

              
						errno.ENOTDIR):

              

            

        
						raise
						raise

        
					if e.errno != errno.ENOENT:
					if e.errno != errno.ENOENT:

        
						show_unmerge("---", "!empty", "dir", obj)
						show_unmerge("---", "!empty", "dir", obj)