--- portage.old/pym/portage.py 2004-02-24 21:41:29.000000000 +0900 +++ portage/pym/portage.py 2004-02-27 17:18:27.575654608 +0900 @@ -5277,21 +5277,20 @@ #link target rather than the link itself. print "--- !found "+str(pkgfiles[obj][0]), obj continue - # next line includes a tweak to protect modules from being unmerged, - # but we don't protect modules from being overwritten if they are - # upgraded. We effectively only want one half of the config protection - # functionality for /lib/modules. For portage-ng both capabilities - # should be able to be independently specified. - if self.isprotected(obj) or ((len(obj) > len(modprotect)) and (obj[0:len(modprotect)]==modprotect)): - print "--- cfgpro "+str(pkgfiles[obj][0]), obj - continue - lstatobj=os.lstat(obj) lmtime=str(lstatobj[ST_MTIME]) if (pkgfiles[obj][0] not in ("dir","fif","dev","sym")) and (lmtime != pkgfiles[obj][1]): print "--- !mtime", pkgfiles[obj][0], obj continue + # next line is a tweak to protect modules from being unmerged, but we + # don't protect modules from being overwritten if they are upgraded. + # For portage-ng both capabilities should be able to be independently + # specified. + if ((len(obj) > len(modprotect)) and (obj[0:len(modprotect)]==modprotect)): + print "--- cfgpro "+str(pkgfiles[obj][0]), obj + continue + if pkgfiles[obj][0]=="dir": if not os.path.isdir(obj): print "--- !dir ","dir", obj @@ -5313,6 +5312,7 @@ if mymd5 != string.lower(pkgfiles[obj][2]): print "--- !md5 ","obj", obj continue + try: os.unlink(obj) except (OSError,IOError),e: