Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 367215 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/lib/portage/pym/portage/update.py (+3 lines)
Lines 56-61 Link Here
56
				else:
56
				else:
57
					return "".join(matchobj.groups())
57
					return "".join(matchobj.groups())
58
			mycontent = re.sub("(%s-)(\\S*)" % old_value, myreplace, mycontent)
58
			mycontent = re.sub("(%s-)(\\S*)" % old_value, myreplace, mycontent)
59
			# revert self-blocks (#367215)
60
			mycontent = re.sub("!" + new_value + "(\\s|$)", "!" + old_value + "\\1", mycontent)
61
59
	elif update_cmd[0] == "slotmove" and update_cmd[1].operator is None:
62
	elif update_cmd[0] == "slotmove" and update_cmd[1].operator is None:
60
		pkg, origslot, newslot = update_cmd[1:]
63
		pkg, origslot, newslot = update_cmd[1:]
61
		old_value = "%s:%s" % (pkg, origslot)
64
		old_value = "%s:%s" % (pkg, origslot)

Return to bug 367215