Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 43066
Collapse All | Expand All

(-)portage.old/pym/portage.py (-9 / +9 lines)
Lines 5277-5297 Link Here
5277
						#link target rather than the link itself.
5277
						#link target rather than the link itself.
5278
						print "--- !found "+str(pkgfiles[obj][0]), obj
5278
						print "--- !found "+str(pkgfiles[obj][0]), obj
5279
						continue
5279
						continue
5280
				# next line includes a tweak to protect modules from being unmerged,
5281
				# but we don't protect modules from being overwritten if they are
5282
				# upgraded. We effectively only want one half of the config protection
5283
				# functionality for /lib/modules. For portage-ng both capabilities
5284
				# should be able to be independently specified.
5285
				if self.isprotected(obj) or ((len(obj) > len(modprotect)) and (obj[0:len(modprotect)]==modprotect)):
5286
					print "--- cfgpro "+str(pkgfiles[obj][0]), obj
5287
					continue
5288
5289
				lstatobj=os.lstat(obj)
5280
				lstatobj=os.lstat(obj)
5290
				lmtime=str(lstatobj[ST_MTIME])
5281
				lmtime=str(lstatobj[ST_MTIME])
5291
				if (pkgfiles[obj][0] not in ("dir","fif","dev","sym")) and (lmtime != pkgfiles[obj][1]):
5282
				if (pkgfiles[obj][0] not in ("dir","fif","dev","sym")) and (lmtime != pkgfiles[obj][1]):
5292
					print "--- !mtime", pkgfiles[obj][0], obj
5283
					print "--- !mtime", pkgfiles[obj][0], obj
5293
					continue
5284
					continue
5294
5285
5286
				# next line is a tweak to protect modules from being unmerged, but we
5287
				# don't protect modules from being overwritten if they are upgraded.
5288
				# For portage-ng both capabilities should be able to be independently
5289
				# specified.
5290
				if ((len(obj) > len(modprotect)) and (obj[0:len(modprotect)]==modprotect)):
5291
					print "--- cfgpro "+str(pkgfiles[obj][0]), obj
5292
					continue
5293
5295
				if pkgfiles[obj][0]=="dir":
5294
				if pkgfiles[obj][0]=="dir":
5296
					if not os.path.isdir(obj):
5295
					if not os.path.isdir(obj):
5297
						print "--- !dir  ","dir", obj
5296
						print "--- !dir  ","dir", obj
Lines 5313-5318 Link Here
5313
					if mymd5 != string.lower(pkgfiles[obj][2]):
5312
					if mymd5 != string.lower(pkgfiles[obj][2]):
5314
						print "--- !md5  ","obj", obj
5313
						print "--- !md5  ","obj", obj
5315
						continue
5314
						continue
5315
5316
					try:
5316
					try:
5317
						os.unlink(obj)
5317
						os.unlink(obj)
5318
					except (OSError,IOError),e:
5318
					except (OSError,IOError),e:

Return to bug 43066