[patch] patch to detect incomplete merges correctly

portage-patch.diff (text/plain), 596 bytes, created by georg.lippold on 2003-12-10 05:40:27 UTC

diff -u pym/portage.py pym-fixed/portage.py
--- pym/portage.py	2003-10-22 04:05:32.000000000 +0200
+++ pym-fixed/portage.py	2003-12-10 14:23:30.000000000 +0100
@@ -3114,9 +3114,10 @@
 		return counter
 
 	def invalidentry(self, mypath):
-		match = re.search(".*/-MERGING-(.*)",mypath)
+		match = re.search(".*/-MERGING-.*",mypath)
 		if match:
 			writemsg(red("INCOMPLETE MERGE:")+match[0]+"\n")
+			writemsg(red("execute \"find -name '-MERGING-*' /var/db/pkg\" and remerge these packages\n")
 		else:
 			if re.search("portage_lockfile$",mypath):
 				writemsg("Lockfile removed: %s" % mypath)