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

(-)pym/portage.py (-1 / +2 lines)
Lines 3114-3122 Link Here
3114
		return counter
3114
		return counter
3115
3115
3116
	def invalidentry(self, mypath):
3116
	def invalidentry(self, mypath):
3117
		match = re.search(".*/-MERGING-(.*)",mypath)
3117
		match = re.search(".*/-MERGING-.*",mypath)
3118
		if match:
3118
		if match:
3119
			writemsg(red("INCOMPLETE MERGE:")+match[0]+"\n")
3119
			writemsg(red("INCOMPLETE MERGE:")+match[0]+"\n")
3120
			writemsg(red("execute \"find -name '-MERGING-*' /var/db/pkg\" and remerge these packages\n")
3120
		else:
3121
		else:
3121
			if re.search("portage_lockfile$",mypath):
3122
			if re.search("portage_lockfile$",mypath):
3122
				writemsg("Lockfile removed: %s" % mypath)
3123
				writemsg("Lockfile removed: %s" % mypath)

Return to bug 35521