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

(-)/usr/lib/portage/pym/portage.py.orig (-5 lines)
Lines 6615-6625 Link Here
6615
								moveme=1
6615
								moveme=1
6616
								cfgfiledict[myrealdest]=[mymd5]
6616
								cfgfiledict[myrealdest]=[mymd5]
6617
								cfgprot=1
6617
								cfgprot=1
6618
							elif cfgfiledict.has_key(myrealdest) and (mymd5 in cfgfiledict[myrealdest]):
6619
								#myd5!=destmd5, we haven't cycled, and the file we're merging has been already merged previously
6620
								zing="-o-"
6621
								moveme=cfgfiledict["IGNORE"]
6622
								cfgprot=cfgfiledict["IGNORE"]
6623
							else:
6618
							else:
6624
								#mymd5!=destmd5, we haven't cycled, and the file we're merging hasn't been merged before
6619
								#mymd5!=destmd5, we haven't cycled, and the file we're merging hasn't been merged before
6625
								moveme=1
6620
								moveme=1

Return to bug 144484